From b002caebe17a6aa24437f03edee3ebd917d05af6a78b666634fcaf54edfd901c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 21 Nov 2011 15:50:54 +0000 Subject: [PATCH 1/3] Remove redundant/unwanted tags/section (cf. specfile guidelines) OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libxslt?expand=0&rev=28 --- libxslt-python.changes | 5 +++++ libxslt-python.spec | 6 +----- libxslt.changes | 5 +++++ libxslt.spec | 5 +---- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/libxslt-python.changes b/libxslt-python.changes index d91a296..5511be9 100644 --- a/libxslt-python.changes +++ b/libxslt-python.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Nov 21 15:49:42 UTC 2011 - jengelh@medozas.de + +- Remove redundant/unwanted tags/section (cf. specfile guidelines) + ------------------------------------------------------------------- Tue Aug 2 15:09:50 UTC 2011 - idonmez@novell.com diff --git a/libxslt-python.spec b/libxslt-python.spec index 1553580..5c7b8b6 100644 --- a/libxslt-python.spec +++ b/libxslt-python.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: libxslt-python @@ -34,7 +33,7 @@ Source: libxslt-%{version}.tar.bz2 Patch0: libxslt-1.1.24-linkflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %{py_requires} -Url: http://xmlsoft.org/XSLT/ +URL: http://xmlsoft.org/XSLT/ #BuildArch: noarch %description @@ -74,9 +73,6 @@ rm -rf %{buildroot}/%{_bindir}/* %{buildroot}/%{_libdir}/lib** %{buildroot}/%{_i 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) %{py_sitedir}/* diff --git a/libxslt.changes b/libxslt.changes index 7cf4e9e..c909a75 100644 --- a/libxslt.changes +++ b/libxslt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Nov 21 15:49:37 UTC 2011 - jengelh@medozas.de + +- Remove redundant/unwanted tags/section (cf. specfile guidelines) + ------------------------------------------------------------------- Sun Nov 20 06:25:40 UTC 2011 - coolo@suse.com diff --git a/libxslt.spec b/libxslt.spec index 38daabf..1d1a63b 100644 --- a/libxslt.spec +++ b/libxslt.spec @@ -31,7 +31,7 @@ BuildRequires: libxml2-devel %ifarch ppc64 Obsoletes: libxslt-64bit %endif -Url: http://xmlsoft.org/XSLT/ +URL: http://xmlsoft.org/XSLT/ # Source: %{name}-%{version}.tar.bz2 Source2: baselibs.conf @@ -123,9 +123,6 @@ install -ma=r '-t%{buildroot}%{_mandir}/man1' '%{SOURCE3}' #kill all "la" files find %{buildroot} -type f -name "*.la" -print -delete -%clean -rm -rf %{buildroot} - %post -n %{name}1 -p /sbin/ldconfig %postun -n %{name}1 -p /sbin/ldconfig From 61936706a675522997eaeaafb93097306a1382796975a8f507506e12ed3d54f1 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 3 Jan 2012 17:34:26 +0000 Subject: [PATCH 2/3] - don't run make check in QEMU builds - breaks due to massive threading OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libxslt?expand=0&rev=29 --- libxslt-python.spec | 15 +++++++-------- libxslt.changes | 5 +++++ libxslt.spec | 18 ++++++++++-------- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/libxslt-python.spec b/libxslt-python.spec index 5c7b8b6..bfd3327 100644 --- a/libxslt-python.spec +++ b/libxslt-python.spec @@ -1,7 +1,7 @@ # # spec file for package libxslt-python # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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,25 +15,24 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: libxslt-python -BuildRequires: libxml2-python python-devel BuildRequires: libgcrypt-devel BuildRequires: libgpg-error-devel BuildRequires: libxml2-devel +BuildRequires: libxml2-python +BuildRequires: python-devel Summary: Python Bindings for libxslt -Version: 1.1.26 -Release: 6 -License: MIT License (or similar) +License: MIT Group: Development/Libraries/Python +Version: 1.1.26 +Release: 0 Source: libxslt-%{version}.tar.bz2 # Uncomment to save space: #NoSource: 0 Patch0: libxslt-1.1.24-linkflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %{py_requires} -URL: http://xmlsoft.org/XSLT/ +Url: http://xmlsoft.org/XSLT/ #BuildArch: noarch %description diff --git a/libxslt.changes b/libxslt.changes index c909a75..f66a025 100644 --- a/libxslt.changes +++ b/libxslt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Dec 3 17:29:03 UTC 2011 - agraf@suse.com + +- don't run make check in QEMU builds - breaks due to massive threading + ------------------------------------------------------------------- Mon Nov 21 15:49:37 UTC 2011 - jengelh@medozas.de diff --git a/libxslt.spec b/libxslt.spec index 1d1a63b..c5c528b 100644 --- a/libxslt.spec +++ b/libxslt.spec @@ -1,7 +1,7 @@ # # spec file for package libxslt # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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,23 +15,22 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: libxslt Version: 1.1.26 -Release: 13 -License: MIT License (or similar) +Release: 0 Summary: XSL Transformation Library +License: MIT Group: System/Libraries BuildRequires: libgcrypt-devel BuildRequires: libgpg-error-devel -BuildRequires: libtool pkg-config +BuildRequires: libtool BuildRequires: libxml2-devel +BuildRequires: pkg-config # bug437293 %ifarch ppc64 Obsoletes: libxslt-64bit %endif -URL: http://xmlsoft.org/XSLT/ +Url: http://xmlsoft.org/XSLT/ # Source: %{name}-%{version}.tar.bz2 Source2: baselibs.conf @@ -59,6 +58,7 @@ engine. %package -n libxslt1 Summary: XSL Transformation Library +License: MIT Group: System/Libraries Provides: libxslt = %{version} Obsoletes: libxslt <= %{version} @@ -81,8 +81,8 @@ 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 +License: LGPL-2.1+ Group: Development/Libraries/C and C++ # bug437293 %ifarch ppc64 @@ -109,7 +109,9 @@ autoreconf --force --install make %{?_smp_mflags} %check +%if ! 0%{?qemu_user_space_build} make check +%endif %install %makeinstall From 2bfc628f88743d1a34f8cc9a0e037166ca6bd2b8367750918aedd347d49cad80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Wed, 4 Jan 2012 13:48:24 +0000 Subject: [PATCH 3/3] Accepting request 98717 from home:babelworx:ldig:branches:devel:libraries:c_c++ Tutorial contains GPL-2.0+ code. Either split this off into a subpackage or add GPL-2.0+ as an aggregation to the main licence tag OBS-URL: https://build.opensuse.org/request/show/98717 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libxslt?expand=0&rev=30 --- libxslt.changes | 6 ++++++ libxslt.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libxslt.changes b/libxslt.changes index f66a025..cff18e1 100644 --- a/libxslt.changes +++ b/libxslt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 4 10:17:35 UTC 2012 - cfarrell@suse.com + +- Tutorial contains GPL-2.0+ code. Either split this off into a subpackage or + add GPL-2.0+ as an aggregation to the main licence tag + ------------------------------------------------------------------- Sat Dec 3 17:29:03 UTC 2011 - agraf@suse.com diff --git a/libxslt.spec b/libxslt.spec index c5c528b..0117783 100644 --- a/libxslt.spec +++ b/libxslt.spec @@ -19,7 +19,7 @@ Name: libxslt Version: 1.1.26 Release: 0 Summary: XSL Transformation Library -License: MIT +License: MIT and GPL-2.0+ Group: System/Libraries BuildRequires: libgcrypt-devel BuildRequires: libgpg-error-devel @@ -58,7 +58,7 @@ engine. %package -n libxslt1 Summary: XSL Transformation Library -License: MIT +License: MIT and GPL-2.0+ Group: System/Libraries Provides: libxslt = %{version} Obsoletes: libxslt <= %{version}