Hello community,
here is the log from the commit of package libxslt for openSUSE:Factory
checked in at Fri Jul 29 10:35:18 CEST 2011.
--------
--- libxslt/libxslt-python.changes 2010-07-21 15:24:57.000000000 +0200
+++ /mounts/work_src_done/STABLE/libxslt/libxslt-python.changes 2011-07-29
06:25:45.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Jul 29 03:46:57 UTC 2011 - crrodrig...@opensuse.org
+
+- Rework build of this package in a sane way.
+
+-------------------------------------------------------------------
--- libxslt/libxslt.changes 2010-07-21 15:24:58.000000000 +0200
+++ /mounts/work_src_done/STABLE/libxslt/libxslt.changes 2011-07-29
06:25:47.000000000 +0200
@@ -1,0 +2,18 @@
+Fri Jul 29 01:53:38 UTC 2011 - crrodrig...@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 - giecr...@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)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
libxslt-config-fixes.patch
xslt-config.1.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libxslt-python.spec ++++++
--- /var/tmp/diff_new_pack.dv2E2O/_old 2011-07-29 10:34:08.000000000 +0200
+++ /var/tmp/diff_new_pack.dv2E2O/_new 2011-07-29 10:34:08.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package libxslt-python (Version 1.1.26)
+# spec file for package libxslt-python
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -19,10 +19,13 @@
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
+Release: 2
License: MIT License (or similar)
Group: Development/Libraries/Python
Source: libxslt-%{version}.tar.bz2
@@ -31,8 +34,8 @@
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,29 @@
%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
++++++ libxslt.spec ++++++
--- /var/tmp/diff_new_pack.dv2E2O/_old 2011-07-29 10:34:08.000000000 +0200
+++ /var/tmp/diff_new_pack.dv2E2O/_new 2011-07-29 10:34:08.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package libxslt (Version 1.1.26)
+# spec file for package libxslt
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -15,27 +15,30 @@
# 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
+Release: 5
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 +56,29 @@
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 +87,9 @@
%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 +98,49 @@
%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
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.dv2E2O/_old 2011-07-29 10:34:08.000000000 +0200
+++ /var/tmp/diff_new_pack.dv2E2O/_new 2011-07-29 10:34:09.000000000 +0200
@@ -1,2 +1,2 @@
-libxslt
+libxslt1
libxslt-devel
++++++ libxslt-config-fixes.patch ++++++
--- 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@"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
