diff --git a/baselibs.conf b/baselibs.conf index 45b3530..70f639a 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -3,5 +3,5 @@ libxslt1 libxslt-devel requires -libxslt- requires "libxslt1- = " - obsoletes "libxslt-devel- <= " + obsoletes "libxslt-devel- < " provides "libxslt-devel- = " diff --git a/libxslt-python.spec b/libxslt-python.spec index 37f3869..b57ada3 100644 --- a/libxslt-python.spec +++ b/libxslt-python.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: libxslt-python BuildRequires: libgcrypt-devel BuildRequires: libgpg-error-devel diff --git a/libxslt.changes b/libxslt.changes index 7a538f8..5328c68 100644 --- a/libxslt.changes +++ b/libxslt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 25 12:23:57 UTC 2012 - chris@computersalat.de + +- add macro "soname" %{name}1 +- fix "self obsoletion" + ------------------------------------------------------------------- Sat Mar 17 17:38:20 UTC 2012 - jengelh@medozas.de diff --git a/libxslt.spec b/libxslt.spec index 0c61ede..836f84d 100644 --- a/libxslt.spec +++ b/libxslt.spec @@ -14,12 +14,23 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: libxslt +%define soname %{name}1 Version: 1.1.26 Release: 0 Summary: XSL Transformation Library License: MIT and GPL-2.0+ Group: System/Libraries +# +Url: http://xmlsoft.org/XSLT/ +Source: %{name}-%{version}.tar.bz2 +Source2: baselibs.conf +Source3: xslt-config.1.gz +Patch0: %{name}-1.1.24-no-net-autobuild.patch +Patch1: libxslt-config-fixes.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libgcrypt-devel BuildRequires: libgpg-error-devel BuildRequires: libtool @@ -29,14 +40,6 @@ BuildRequires: pkg-config %ifarch ppc64 Obsoletes: libxslt-64bit %endif -Url: http://xmlsoft.org/XSLT/ -# -Source: %{name}-%{version}.tar.bz2 -Source2: baselibs.conf -Source3: xslt-config.1.gz -Patch0: %{name}-1.1.24-no-net-autobuild.patch -Patch1: libxslt-config-fixes.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This C library allows you to transform XML files into other XML files @@ -51,12 +54,12 @@ to be a relatively fast processor. It also includes full support for the EXSLT set of extension functions as well as some common extensions present in other XSLT engines. -%package -n libxslt1 +%package -n %{soname} Summary: XSL Transformation Library License: LGPL-2.1+ Group: System/Libraries -%description -n libxslt1 +%description -n %{soname} This C library allows you to transform XML files into other XML files (or HTML, text, and more) using the standard XSLT stylesheet transformation mechanism. @@ -78,13 +81,13 @@ License: LGPL-2.1+ Group: Development/Libraries/C and C++ # bug437293 %ifarch ppc64 -Obsoletes: libxslt-devel-64bit +Obsoletes: %{name}-devel-64bit %endif -Requires: %{name}1 = %{version} +Requires: %{name}-tools = %version +Requires: %{soname} = %{version} +Requires: glibc-devel Requires: libgcrypt-devel Requires: libgpg-error-devel -Requires: glibc-devel -Requires: %name-tools = %version #libxml is automatically required with pkgconfig %description devel @@ -97,8 +100,8 @@ License: MIT and GPL-2.0+ Group: Development/Tools Provides: xsltproc = %version-%release # O/P added during 12.2 dev: -Provides: libxslt = %version-%release -Obsoletes: libxslt <= %version-%release +Obsoletes: %{name} < %version-%release +Provides: %{name} = %version-%release %description tools This package contains xsltproc, a command line interface to the XSLT engine. @@ -130,11 +133,11 @@ install -ma=r '-t%{buildroot}%{_mandir}/man1' '%{SOURCE3}' #kill all "la" files find %{buildroot} -type f -name "*.la" -print -delete -%post -n %{name}1 -p /sbin/ldconfig +%post -n %{soname} -p /sbin/ldconfig -%postun -n %{name}1 -p /sbin/ldconfig +%postun -n %{soname} -p /sbin/ldconfig -%files -n %{name}1 +%files -n %{soname} %defattr(-, root, root) %{_libdir}/lib*.so.*