From b29054d9587001605c8d1cdafbbacf164a48aa7e9284a50f2408406af0e5991c Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 29 Jul 2011 08:35:20 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/libxslt revision 23.0 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libxslt?expand=0&rev=6b90d600879934e143d63c3bc0fe6da1 --- libxslt-python.spec | 7 ++++--- libxslt.spec | 10 +++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/libxslt-python.spec b/libxslt-python.spec index 50311a4..73c1c2f 100644 --- a/libxslt-python.spec +++ b/libxslt-python.spec @@ -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 @@ -25,7 +25,7 @@ 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 @@ -68,6 +68,7 @@ make install PYTHON_SITE_PACKAGES=%{py_sitedir} pythondir=%{py_sitedir} DESTDIR= rm -fr $RPM_BUILD_ROOT%{_datadir}/doc # #223696 find %{buildroot} -type f -name "*.la" -print -delete + %clean rm -rf $RPM_BUILD_ROOT diff --git a/libxslt.spec b/libxslt.spec index 193d7a1..66fe893 100644 --- a/libxslt.spec +++ b/libxslt.spec @@ -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 @@ -16,9 +16,10 @@ # + Name: libxslt Version: 1.1.26 -Release: 1 +Release: 5 License: MIT License (or similar) Summary: XSL Transformation Library Group: System/Libraries @@ -56,6 +57,7 @@ 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} @@ -97,6 +99,7 @@ to develop applications that require these. %setup -q %patch0 %patch1 + %build autoreconf --force --install %configure --disable-static --with-pic --without-python @@ -113,6 +116,7 @@ rm -fr %{buildroot}%{_datadir}/doc install -ma=r '-t%{buildroot}%{_mandir}/man1' '%{SOURCE3}' #kill all "la" files find %{buildroot} -type f -name "*.la" -print -delete + %clean rm -rf %{buildroot} From f301b514bc02ade053e10ff2b329f70985d1df72af993db31d083f1a9797ae07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 29 Jul 2011 09:41:55 +0000 Subject: [PATCH 2/2] - Fix build by not using %exclude - Fix build on SLE OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libxslt?expand=0&rev=14 --- libxslt-python.changes | 5 +++++ libxslt-python.spec | 13 +++++-------- libxslt.changes | 5 +++++ libxslt.spec | 10 +++++++--- 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/libxslt-python.changes b/libxslt-python.changes index 5890da9..00c562a 100644 --- a/libxslt-python.changes +++ b/libxslt-python.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 29 09:37:15 UTC 2011 - idonmez@novell.com + +- Fix build by not using %exclude + ------------------------------------------------------------------- Fri Jul 29 03:46:57 UTC 2011 - crrodriguez@opensuse.org diff --git a/libxslt-python.spec b/libxslt-python.spec index 73c1c2f..6314c8b 100644 --- a/libxslt-python.spec +++ b/libxslt-python.spec @@ -69,20 +69,17 @@ rm -fr $RPM_BUILD_ROOT%{_datadir}/doc # #223696 find %{buildroot} -type f -name "*.la" -print -delete +# Stuff we won't package +rm -rf %{buildroot}/%{_bindir}/* %{buildroot}/%{_libdir}/lib** %{buildroot}/%{_includedir}/* +rm -rf %{buildroot}/%{_mandir}/* %{buildroot}/%{_libdir}/pkgconfig/* +rm -rf %{buildroot}/%{_libdir}/xsltConf.sh %{buildroot}/%{_datadir}/aclocal/libxslt.m4 + %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}/* -%doc python/TODO %doc python/libxslt-python-api.xml %doc python/tests/*.py %doc python/tests/*.xml diff --git a/libxslt.changes b/libxslt.changes index d0d902f..0f780ce 100644 --- a/libxslt.changes +++ b/libxslt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 29 09:37:02 UTC 2011 - idonmez@novell.com + +- Fix build on SLE + ------------------------------------------------------------------- Fri Jul 29 01:53:38 UTC 2011 - crrodriguez@opensuse.org diff --git a/libxslt.spec b/libxslt.spec index 66fe893..d7382d6 100644 --- a/libxslt.spec +++ b/libxslt.spec @@ -26,7 +26,7 @@ Group: System/Libraries BuildRequires: libgcrypt-devel BuildRequires: libgpg-error-devel BuildRequires: pkg-config -BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: libxml2-devel # bug437293 %ifarch ppc64 Obsoletes: libxslt-64bit @@ -56,9 +56,10 @@ present in other XSLT engines. The package comes with xsltproc, a command line interface to the XSLT engine. -%package -n %{name}1 +%package -n libxslt1 Summary: XSL Transformation Library +Group: System/Libraries Provides: libxslt = %{version} Obsoletes: %{name} < %{version} Provides: xsltproc = %{version} @@ -109,11 +110,14 @@ make %{?_smp_mflags} make check %install -%make_install +%makeinstall + # Unwanted doc stuff 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