Accepting request 77396 from devel:libraries:c_c++

- Rework build of this package in a sane way. - Fix broken requires,provides,Obsoletes causing "have choice.." build system errors - Remove all "la" files since they are no longer needed - Fix -devel pacakge requires and messed up -config scripts this may cause build fails of already broken dependant packages that do not link all the needed libraries in an explicit manner (This is not a bug here, it is expected to cause it) (forwarded request 77392 from elvigia) OBS-URL: https://build.opensuse.org/request/show/77396 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libxslt?expand=0&rev=22
2011-07-29 08:35:10 +00:00 · 2011-07-29 08:35:10 +00:00 · d3c7d3e53e
commit d3c7d3e53e
parent b7d5600d6f 756de289e8
7 changed files with 112 additions and 44 deletions
--- a/baselibs.conf
+++ b/baselibs.conf
@ -1,2 +1,2 @@
-libxslt
+libxslt1
 libxslt-devel
--- a/libxslt-config-fixes.patch
+++ b/libxslt-config-fixes.patch
@ -0,0 +1,21 @@
+--- xslt-config.in.orig
+++ xslt-config.in
+@@ -89,7 +89,7 @@ while test $# -gt 0; do
+     shift
+ done
+ 
+-the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@"
+the_libs="-lxslt"
+ if test "$includedir" != "/usr/include"; then
+     the_flags="$the_flags -I$includedir `@XML_CONFIG@ --cflags`"
+ else
+--- xsltConf.sh.in.orig
+++ xsltConf.sh.in
+@@ -2,6 +2,6 @@
+ # Configuration file for using the xslt library
+ #
+ XSLT_LIBDIR="@XSLT_LIBDIR@"
+-XSLT_LIBS="@XSLT_LIBS@"
+XSLT_LIBS="-lxslt"
+ XSLT_INCLUDEDIR="@XSLT_INCLUDEDIR@"
+ MODULE_VERSION="xslt-@VERSION@"
--- a/libxslt-python.changes
+++ b/libxslt-python.changes
@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jul 29 03:46:57 UTC 2011 - crrodriguez@opensuse.org
+
+- Rework build of this package in a sane way.
+
 -------------------------------------------------------------------
 Wed Jul 21 13:19:36 UTC 2010 - puzel@novell.com

--- a/libxslt-python.spec
+++ b/libxslt-python.spec
@ -19,7 +19,10 @@


 Name:           libxslt-python
-BuildRequires:  libxml2-python libxslt-devel python-devel
+BuildRequires:  libxml2-python python-devel
+BuildRequires:  libgcrypt-devel
+BuildRequires:  libgpg-error-devel
+BuildRequires:  libxml2-devel
 Summary:        Python Bindings for libxslt
 Version:        1.1.26
 Release:        1
@ -31,8 +34,8 @@ Source:         libxslt-%{version}.tar.bz2
 Patch0:         libxslt-1.1.24-linkflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{py_requires}
-Requires:       libxml2 >= 2.6.27
 Url:            http://xmlsoft.org/XSLT/
+#BuildArch:      noarch

 %description
 The libxslt-python package contains a module that permits applications
@ -56,33 +59,28 @@ Authors:

 %build
 autoreconf --force --install
-CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
-%configure
-# use libxslt as built by libxslt source package
-mkdir libxslt/.libs libexslt/.libs
-cp -v %{_libdir}/libxslt.la libxslt
-cp -v %{_libdir}/libexslt.la libexslt
-make -C python
+%configure --with-python --with-pic --disable-static
+make %{?_smp_mflags} PYTHON_SITE_PACKAGES=%{py_sitedir} pythondir=%{py_sitedir}

 %install
-export RPM_BUILD_ROOT
-make -C python install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	pythondir=%{py_sitedir} \
-	PYTHON_SITE_PACKAGES=%{py_sitedir}
+make install PYTHON_SITE_PACKAGES=%{py_sitedir} pythondir=%{py_sitedir} DESTDIR=$RPM_BUILD_ROOT
 # Unwanted doc stuff
 rm -fr $RPM_BUILD_ROOT%{_datadir}/doc
 # #223696
-rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.{la,a}
-
+find %{buildroot} -type f -name "*.la" -print -delete
 %clean
 rm -rf $RPM_BUILD_ROOT

 %files
 %defattr(-, root, root)
+%exclude %{_bindir}/*
+%exclude %{_libdir}/lib**
+%exclude %{_includedir}/*
+%exclude %{_mandir}/*
+%exclude %{_libdir}/pkgconfig/*
+%exclude %{_libdir}/xsltConf.sh
+%exclude /usr/share/aclocal/libxslt.m4
 %{py_sitedir}/*
-# %{python_sitepath}/libxslt.py
-# %{python_sitepath}/libxsltmod.so
 %doc python/TODO
 %doc python/libxslt-python-api.xml
 %doc python/tests/*.py
--- a/libxslt.changes
+++ b/libxslt.changes
@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Fri Jul 29 01:53:38 UTC 2011 - crrodriguez@opensuse.org
+
+- Fix broken requires,provides,Obsoletes causing "have choice.."
+  build system errors
+- Remove all "la" files since they are no longer needed
+- Fix -devel pacakge requires and messed up -config scripts
+  this may cause build fails of already broken dependant packages
+  that do not link all the needed libraries in an explicit manner
+  (This is not a bug here, it is expected to cause it)
+
+-------------------------------------------------------------------
+Wed Jul 27 09:14:25 UTC 2011 - giecrilj@stegny.2a.pl
+
+- package clean-up:
+  - include library version number in the name of the binary package
+  - add an alias for xsltproc (required by package xmlto)
+
 -------------------------------------------------------------------
 Wed Jul 21 13:11:00 UTC 2010 - puzel@novell.com

--- a/libxslt.spec
+++ b/libxslt.spec
@ -15,27 +15,29 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #

-# norootforbuild
-

 Name:           libxslt
-BuildRequires:  libgcrypt libgcrypt-devel libgpg-error libgpg-error-devel libxml2-devel pkg-config
-Summary:        XSL Transformation Library
 Version:        1.1.26
 Release:        1
 License:        MIT License (or similar)
+Summary:        XSL Transformation Library
 Group:          System/Libraries
+BuildRequires:  libgcrypt-devel
+BuildRequires:  libgpg-error-devel
+BuildRequires:  pkg-config
+BuildRequires:  pkgconfig(libxml-2.0)
 # bug437293
 %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
-Requires:       libxml2 >= 2.6.27
-Url:            http://xmlsoft.org/XSLT/

 %description
 This C library allows you to transform XML files into other XML files
@ -53,6 +55,28 @@ present in other XSLT engines.
 The package comes with xsltproc, a command line interface to the XSLT
 engine.

+%package -n %{name}1
+Summary:        XSL Transformation Library
+Provides:       libxslt = %{version}
+Obsoletes:      %{name} < %{version}
+Provides:       xsltproc = %{version}
+
+%description -n libxslt1
+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.
+
+It is based on libxml (version 2) for XML parsing, tree manipulation,
+and XPath support. It is written in plain C, making as few assumptions
+as possible and sticks closely to ANSI C/POSIX for easy embedding.
+Although not primarily designed with performance in mind, libxslt seems
+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.
+
+The package comes with xsltproc, a command line interface to the XSLT
+engine.
+
 %package devel
 License:        LGPLv2.1+
 Summary:        Include Files and Libraries mandatory for Development
@ -61,10 +85,9 @@ Group:          Development/Libraries/C and C++
 %ifarch ppc64
 Obsoletes:      libxslt-devel-64bit
 %endif
-#
-Requires:       %{name} = %{version}
-Requires:       libxml2-devel >= 2.6.27
-Requires:       libgcrypt-devel libgpg-error-devel glibc-devel pkg-config
+Requires:       %{name}1 = %{version}
+Requires:       glibc-devel
+#libxml is automatically required with pkgconfig

 %description devel
 This package contains all necessary include files and libraries needed
@ -73,47 +96,47 @@ to develop applications that require these.
 %prep
 %setup -q
 %patch0
-
+%patch1
 %build
 autoreconf --force --install
-CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
 %configure --disable-static --with-pic --without-python
-%{__make} %{?jobs:-j%jobs}
+make %{?_smp_mflags}

 %check
 make check

 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+%make_install
 # Unwanted doc stuff
-rm -fr $RPM_BUILD_ROOT%{_datadir}/doc
-# libxslt-python uses these
-#%{__rm} -f %{buildroot}%{_libdir}/*.la
-
+rm -fr %{buildroot}%{_datadir}/doc
+# the manual page is required
+install -ma=r '-t%{buildroot}%{_mandir}/man1' '%{SOURCE3}'
+#kill all "la" files
+find %{buildroot} -type f -name "*.la" -print -delete
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}

-%post -p /sbin/ldconfig
+%post -n %{name}1 -p /sbin/ldconfig

-%postun -p /sbin/ldconfig
+%postun -n %{name}1 -p /sbin/ldconfig

-%files
+%files -n %{name}1
 %defattr(-, root, root)
 %doc AUTHORS NEWS README COPYING* Copyright TODO FEATURES
 %{_libdir}/lib*.so.*
 %{_bindir}/xsltproc
-%{_mandir}/man1/xsltproc.1*
+%doc %{_mandir}/man1/xsltproc.*

 %files devel
 %defattr(-, root, root)
 %{_libdir}/lib*.so
 %{_libdir}/*.sh
 %{_libdir}/pkgconfig/*.pc
-%{_libdir}/lib*.la
 %{_includedir}/*
 %{_datadir}/aclocal/*
 %{_bindir}/xslt-config
-%{_mandir}/man3/*
+%doc %{_mandir}/man1/xslt-config.*
+%doc %{_mandir}/man3/*
 # not available doc/*.png
 %doc doc/*.html doc/html doc/tutorial doc/*.gif

--- a/xslt-config.1.gz
+++ b/xslt-config.1.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4f2280a1ea263baff6430421d96be547439c72ff7738ef0a3b106f1c92e0a9e1
+size 472