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

@@ -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
 

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*