Accepting request 359928 from Base:System

1

OBS-URL: https://build.opensuse.org/request/show/359928
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xz?expand=0&rev=55

xz.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Feb 14 09:21:33 UTC 2016 - tchvatal@suse.com
+
+- Do not split out lang_package conditional, used in sle10 out of support
+
 -------------------------------------------------------------------
 Tue Nov 10 14:34:14 UTC 2015 - hpj@urpla.net
 

xz.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package xz
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,6 +18,12 @@
 
 # avoid bootstrapping problem
 %define _binary_payload w9.bzdio
+%if 0%{?suse_version} < 1130
+%define do_profiling 0
+%endif
+%ifarch aarch64 %arm %{sparc}
+%define do_profiling 0
+%endif
 %if 0%{?centos_version} || 0%{?rhel_version}
 %if 0%{?centos_version} <= 600 || 0%{?rhel_version <= 600}
 %bcond_without static_libs
@@ -25,12 +31,6 @@
 %else
 %bcond_with    static_libs
 %endif
-%if 0%{?suse_version} < 1130
-%define do_profiling 0
-%endif
-%ifarch aarch64 %{arm} %{sparc}
-%define do_profiling 0
-%endif
 Name:           xz
 Version:        5.2.2
 Release:        0
@@ -55,23 +55,18 @@ Recommends:     %{name}-lang
 
 %description
 The xz command is a very powerful program for compressing files.
-
 * Average compression ratio of LZMA is about 30% better than that of
    gzip, and 15% better than that of bzip2.
-
 * Decompression speed is only little slower than that of gzip, being
    two to five times faster than bzip2.
-
 * In fast mode, compresses faster than bzip2 with a comparable
    compression ratio.
-
 * Achieving the best compression ratios takes four to even twelve
    times longer than with bzip2. However. this doesn't affect
    decompressing speed.
-
 * Very similar command line interface to what gzip and bzip2 have.
 
-%{?lang_package}
+%lang_package
 
 %package -n liblzma5
 Summary:        LZMA library
@@ -94,7 +89,6 @@ This package contains the header files and libraries needed for
 compiling programs using the LZMA library.
 
 %if %{with static_libs}
-
 %package static-devel
 Summary:        Static version of LZMA library
 Group:          Development/Libraries/C and C++
@@ -116,7 +110,7 @@ export LDFLAGS="-Wl,-z,relro,-z,now -pie"
 %endif
 	--with-pic \
 	--docdir=%{_docdir}/%{name}
-%if %{do_profiling}
+%if 0%{do_profiling}
 profiledir=$(mktemp -d)
 trap "rm -rf $profiledir" EXIT
 make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_generate}=$profiledir"
@@ -138,21 +132,12 @@ cp -p %{SOURCE4} %{buildroot}%{_bindir}
 cp -p %{SOURCE5} %{buildroot}%{_mandir}/man1/
 
 %post -n liblzma5 -p /sbin/ldconfig
-
 %postun -n liblzma5 -p /sbin/ldconfig
 
-%if 0%{?lang_package:1} > 0
-
 %files lang -f %{name}.lang
 %defattr(-, root, root)
 
 %files
-%defattr(-,root,root)
-%else
-
-%files -f %{name}.lang
-%defattr(-, root, root)
-%endif
 %defattr(-, root, root)
 %{_docdir}/%{name}
 %{_bindir}/*
@@ -170,7 +155,6 @@ cp -p %{SOURCE5} %{buildroot}%{_mandir}/man1/
 %{_libdir}/pkgconfig/*.pc
 
 %if %{with static_libs}
-
 %files static-devel
 %defattr(-, root, root)
 %{_libdir}/*.a