Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/remove_spec_in'
Browse files Browse the repository at this point in the history
Conflicts:
	VERSION
	package/yast2-pkg-bindings.changes
  • Loading branch information
jreidinger committed Oct 8, 2013
2 parents 8d77c8a + 23047e7 commit 71352f9
Show file tree
Hide file tree
Showing 7 changed files with 143 additions and 87 deletions.
2 changes: 1 addition & 1 deletion VERSION
@@ -1 +1 @@
3.0.3
3.1.0
7 changes: 7 additions & 0 deletions package/yast2-pkg-bindings-devel-doc.changes
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Sep 19 14:18:41 UTC 2013 - lslezak@suse.cz

- do not use *.spec.in template, use *.spec file with RPM macros
instead
- 3.1.0

-------------------------------------------------------------------
Tue Jul 30 08:29:16 UTC 2013 - yast-devel@opensuse.org

Expand Down
64 changes: 64 additions & 0 deletions package/yast2-pkg-bindings-devel-doc.spec
@@ -0,0 +1,64 @@
#
# spec file for package yast2-pkg-bindings
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#

Name: yast2-pkg-bindings-devel-doc

Version: 3.1.0
Release: 0
License: GPL-2.0
Group: Documentation/HTML
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-pkg-bindings-3.1.0.tar.bz2
Prefix: %_prefix

# same as in the main package (because we use the same configure.in.in)
BuildRequires: docbook-xsl-stylesheets
BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: libxslt
BuildRequires: libzypp-devel >= 6.10.0
BuildRequires: yast2-core-devel
BuildRequires: yast2-devtools >= 3.0.6

Buildarch: noarch
Requires: yast2-pkg-bindings = %{version}
Summary: YaST2 - Documentation for yast2-pkg-bindings package
Group: Documentation/HTML

%description
This documenation package describes the package manager API (Pkg::
namespace) used in YaST scripts. The documentation is autogenerated
from the pkg-bindings sources.

%prep
%setup -n %{name}-%{version}
# build only documentation, ignore all other directories
echo "doc" > SUBDIRS

%build
%yast_build

%install
%yast_install


%files
%defattr(-,root,root)
%doc %{yast_docdir}/html
%dir %{yast_docdir}
%exclude %{yast_docdir}/COPYING
%exclude %{yast_docdir}/README
7 changes: 7 additions & 0 deletions package/yast2-pkg-bindings.changes
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Sep 30 14:18:10 UTC 2013 - lslezak@suse.cz

- do not use *.spec.in template, use *.spec file with RPM macros
instead
- 3.1.0

-------------------------------------------------------------------
Mon Sep 30 08:59:03 UTC 2013 - lslezak@suse.cz

Expand Down
64 changes: 64 additions & 0 deletions package/yast2-pkg-bindings.spec
@@ -0,0 +1,64 @@
#
# spec file for package yast2-pkg-bindings
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#


Name: yast2-pkg-bindings
Version: 3.1.0
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2

Group: System/YaST
License: GPL-2.0

BuildRequires: docbook-xsl-stylesheets
BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: libxslt
BuildRequires: libzypp-devel >= 6.10.0
BuildRequires: yast2-core-devel
BuildRequires: yast2-devtools >= 3.0.6

# new GPG callbacks
Requires: libzypp >= 6.10.0

Summary: YaST2 - Package Manager Access

%description
This package contains a name space for accessing the package manager
library in YaST2.

%prep
%setup -n %{name}-%{version}
# build only the library, ignore documentation (it is in devel-doc package)
echo "src" > SUBDIRS

%build
%yast_build

%install
%yast_install

rm -rf %{buildroot}/%{yast_plugindir}/libpy2Pkg.la


%files
%defattr(-,root,root)
%{yast_plugindir}/libpy2Pkg.so.*
%{yast_plugindir}/libpy2Pkg.so
%doc %{yast_docdir}
47 changes: 0 additions & 47 deletions yast2-pkg-bindings-devel-doc.spec.in

This file was deleted.

39 changes: 0 additions & 39 deletions yast2-pkg-bindings.spec.in

This file was deleted.

0 comments on commit 71352f9

Please sign in to comment.