From a7bc0d922de9bdb66429d32414fc4bc3342ec99a357dde1904a65178ec1ab1d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Mon, 26 Sep 2011 17:58:10 +0000 Subject: [PATCH 1/3] Accepting request 84931 from devel:tools:building - build on SLE_10 OBS-URL: https://build.opensuse.org/request/show/84931 OBS-URL: https://build.opensuse.org/package/show/Base:System/xz?expand=0&rev=36 --- xz.changes | 5 +++++ xz.spec | 25 ++++++++++++++++++++++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/xz.changes b/xz.changes index 69d0f49..9571dad 100644 --- a/xz.changes +++ b/xz.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 26 15:59:51 UTC 2011 - coolo@suse.com + +- build on SLE_10 + ------------------------------------------------------------------- Sat Sep 17 15:19:50 UTC 2011 - coolo@suse.com diff --git a/xz.spec b/xz.spec index 67bede3..087b204 100644 --- a/xz.spec +++ b/xz.spec @@ -27,10 +27,19 @@ Url: http://tukaani.org/lzma/ Source: http://tukaani.org/xz/%{name}-%{version}.tar.bz2 Source2: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: pkg-config +BuildRequires: pkgconfig Provides: lzma = %version Obsoletes: lzma < %version + +%if 0%{?suse_version} > 1400 +%define do_factory 1 +%else +%define do_profiling 0 +%endif + +%if 0%{?do_factory} > 1 Recommends: %name-lang +%endif # avoid bootstrapping problem %define _binary_payload w9.bzdio @@ -52,8 +61,10 @@ The xz command is a very powerful program for compressing files. * Very similar command line interface to what gzip and bzip2 have. - +%if 0%{?do_factory} > 1 %lang_package +%endif + %package -n liblzma5 License: LGPLv2.1+ Summary: LZMA library @@ -80,7 +91,6 @@ compiling programs using the LZMA library. %setup -q %build -AUTOPOINT=true autoreconf -fiv %if %{do_profiling} profiledir=$(mktemp -d) trap "rm -rf $profiledir" EXIT @@ -111,13 +121,22 @@ make install DESTDIR=$RPM_BUILD_ROOT %postun -n liblzma5 -p /sbin/ldconfig +%if 0%{?do_factory} > 0 + %files +%else + +%files -f %{name}.lang +%endif %defattr(-, root, root) %_docdir/%name %{_bindir}/* %{_mandir}/man?/* +%if 0%{?do_factory} > 0 + %files lang -f %{name}.lang +%endif %files -n liblzma5 %defattr(-, root, root) From b64f18070a274aa956566ca229c64c3100d169753c36cf06b888e92a1dde15df Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 27 Sep 2011 07:28:36 +0000 Subject: [PATCH 2/3] fix last fix OBS-URL: https://build.opensuse.org/package/show/Base:System/xz?expand=0&rev=37 --- xz.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xz.spec b/xz.spec index 087b204..fe0866f 100644 --- a/xz.spec +++ b/xz.spec @@ -31,13 +31,13 @@ BuildRequires: pkgconfig Provides: lzma = %version Obsoletes: lzma < %version -%if 0%{?suse_version} > 1400 +%if 0%{?suse_version} > 1140 %define do_factory 1 %else %define do_profiling 0 %endif -%if 0%{?do_factory} > 1 +%if 0%{?do_factory} > 0 Recommends: %name-lang %endif # avoid bootstrapping problem @@ -61,7 +61,7 @@ The xz command is a very powerful program for compressing files. * Very similar command line interface to what gzip and bzip2 have. -%if 0%{?do_factory} > 1 +%if 0%{?do_factory} > 0 %lang_package %endif From 1770765900444ff719d3d72ac9557ef503fd90b7f4e7bfbfea05511d434e9707 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 27 Sep 2011 13:40:01 +0000 Subject: [PATCH 3/3] Accepting request 85092 from home:rudi_m:branches:Base:System - minor fixes of last portability changes: * decouple do_profiling and lang_package again * don't define do_factory, just use lang_package instead * simplify files section * do_profiling for some more systems OBS-URL: https://build.opensuse.org/request/show/85092 OBS-URL: https://build.opensuse.org/package/show/Base:System/xz?expand=0&rev=38 --- xz.changes | 9 +++++++++ xz.spec | 19 ++++++------------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/xz.changes b/xz.changes index 9571dad..5479482 100644 --- a/xz.changes +++ b/xz.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Sep 27 13:05:34 UTC 2011 - sweet_f_a@gmx.de + +- minor fixes of last portability changes: + * decouple do_profiling and lang_package again + * don't define do_factory, just use lang_package instead + * simplify files section + * do_profiling for some more systems + ------------------------------------------------------------------- Mon Sep 26 15:59:51 UTC 2011 - coolo@suse.com diff --git a/xz.spec b/xz.spec index fe0866f..8943770 100644 --- a/xz.spec +++ b/xz.spec @@ -31,13 +31,11 @@ BuildRequires: pkgconfig Provides: lzma = %version Obsoletes: lzma < %version -%if 0%{?suse_version} > 1140 -%define do_factory 1 -%else +%if 0%{?suse_version} < 1130 %define do_profiling 0 %endif -%if 0%{?do_factory} > 0 +%if 0%{?lang_package:1} > 0 Recommends: %name-lang %endif # avoid bootstrapping problem @@ -61,9 +59,7 @@ The xz command is a very powerful program for compressing files. * Very similar command line interface to what gzip and bzip2 have. -%if 0%{?do_factory} > 0 -%lang_package -%endif +%{?lang_package} %package -n liblzma5 License: LGPLv2.1+ @@ -121,7 +117,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %postun -n liblzma5 -p /sbin/ldconfig -%if 0%{?do_factory} > 0 +%if 0%{?lang_package:1} > 0 + +%files lang -f %{name}.lang %files %else @@ -133,11 +131,6 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_bindir}/* %{_mandir}/man?/* -%if 0%{?do_factory} > 0 - -%files lang -f %{name}.lang -%endif - %files -n liblzma5 %defattr(-, root, root) /%{_lib}/lib*.so.5*