Accepting request 210449 from Base:System

- add optional -static-devel library package, intended to publish pixz for
  CentOS / RHEL, default off

- Use gzipped archive to prevent a build cycle on older targets
  * http://lists.opensuse.org/opensuse-buildservice/2013-10/msg00079.html
- Add a signature and keyring file for source verification
  * not enable in spec due bootstrapping issues

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

xz-5.0.5.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5dcffe6a3726d23d1711a65288de2e215b4960da5092248ce63c99d50093b93a
+size 1305685

xz-5.0.5.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3515c74d170d0f6ec00820de63106ad16c07bae55a59c174b4741242c76264a4
-size 928700

xz.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Sun Nov 24 16:25:53 UTC 2013 - andreas.stieger@gmx.de
+
+- add optional -static-devel library package, intended to publish pixz for
+  CentOS / RHEL, default off
+
+-------------------------------------------------------------------
+Wed Oct 16 08:53:16 UTC 2013 - mvyskocil@suse.com
+
+- Use gzipped archive to prevent a build cycle on older targets
+  * http://lists.opensuse.org/opensuse-buildservice/2013-10/msg00079.html
+- Add a signature and keyring file for source verification
+  * not enable in spec due bootstrapping issues
+
 -------------------------------------------------------------------
 Tue Jul 16 13:52:16 UTC 2013 - idonmez@suse.com
 

xz.keyring

@@ -0,0 +1,56 @@
+pub   4096R/69184620 2010-10-24
+uid                  Lasse Collin <lasse.collin@tukaani.org>
+sub   4096R/58ADF744 2010-10-24
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+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
+wOSlnSuT
+=u8YC
+-----END PGP PUBLIC KEY BLOCK-----

xz.spec

@@ -16,15 +16,26 @@
 #
 
 
+%if 0%{?centos_version} || 0%{?rhel_version}
+%if 0%{?centos_version} <= 600 || 0%{?rhel_version <= 600}
+%bcond_without static_libs
+%endif
+%else
+%bcond_with    static_libs
+%endif
+
 Name:           xz
 Summary:        A Program for Compressing Files
 License:        LGPL-2.1+ and GPL-2.0+
 Group:          Productivity/Archiving/Compression
 Version:        5.0.5
 Release:        0
-Url:            http://tukaani.org/lzma/
+Url:            http://tukaani.org/xz/
-Source:         http://tukaani.org/xz/%{name}-%{version}.tar.xz
+Source0:        http://tukaani.org/xz/%{name}-%{version}.tar.gz
+Source1:        http://tukaani.org/xz/%{name}-%{version}.tar.gz.sig
 Source2:        baselibs.conf
+# from http://tukaani.org/misc/lasse_collin_pubkey.txt#/xz.keyring
+Source3:        xz.keyring
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  pkgconfig
 Provides:       lzma = %version
@@ -83,22 +94,43 @@ Obsoletes:      lzma-alpha-devel < %version
 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++
+Requires:       lzma-devel = %version
+
+%description static-devel
+Static library for the LZMA library 
+%endif
+
 %prep
 %setup -q
 
 %build
+%global optflags    %{optflags} -D_REENTRANT -pipe
 %if %{do_profiling}
 profiledir=$(mktemp -d)
 trap "rm -rf $profiledir" EXIT
 export CFLAGS="%optflags %{cflags_profile_generate}=$profiledir"
 %endif
-%configure --disable-static --with-pic --docdir=%_docdir/%name
+%configure \
+%if ! %{with static_libs}
+	--disable-static \
+%endif
+	--with-pic \
+	--docdir=%_docdir/%name
 make %{?_smp_mflags}
 %if %{do_profiling}
 time make check
 make clean
 export CFLAGS="%optflags %{cflags_profile_feedback}=$profiledir"
-%configure --disable-static --with-pic --docdir=%_docdir/%name
+%configure \
+%if %{without static_libs}
+	--disable-static \
+%endif
+	--with-pic \
+	--docdir=%_docdir/%name
 make %{?_smp_mflags}
 %endif
 
@@ -117,11 +149,13 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %if 0%{?lang_package:1} > 0
 
 %files lang -f %{name}.lang
+%defattr(-, root, root)
 
 %files
 %else
 
 %files -f %{name}.lang
+%defattr(-, root, root)
 %endif
 %defattr(-, root, root)
 %_docdir/%name
@@ -139,4 +173,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc
 
+%if %{with static_libs}
+%files static-devel
+%defattr(-, root, root)
+%{_libdir}/*.a
+%endif
+
 %changelog