From c834d746ed238fa724d418d5158d36979445c08be471262637524ce473d2b706 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 23 Sep 2014 08:40:06 +0000 Subject: [PATCH] Accepting request 251497 from home:AndreasStieger:branches:Base:System xz 5.0.7 OBS-URL: https://build.opensuse.org/request/show/251497 OBS-URL: https://build.opensuse.org/package/show/Base:System/xz?expand=0&rev=64 --- xz-5.0.5.tar.gz | 3 --- xz-5.0.5.tar.gz.sig | Bin 543 -> 0 bytes xz-5.0.7.tar.gz | 3 +++ xz-5.0.7.tar.gz.sig | Bin 0 -> 543 bytes xz.changes | 13 +++++++++ xz.spec | 64 ++++++++++++++++++++++---------------------- 6 files changed, 48 insertions(+), 35 deletions(-) delete mode 100644 xz-5.0.5.tar.gz delete mode 100644 xz-5.0.5.tar.gz.sig create mode 100644 xz-5.0.7.tar.gz create mode 100644 xz-5.0.7.tar.gz.sig diff --git a/xz-5.0.5.tar.gz b/xz-5.0.5.tar.gz deleted file mode 100644 index 2a7bf41..0000000 --- a/xz-5.0.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5dcffe6a3726d23d1711a65288de2e215b4960da5092248ce63c99d50093b93a -size 1305685 diff --git a/xz-5.0.5.tar.gz.sig b/xz-5.0.5.tar.gz.sig deleted file mode 100644 index 094e7128191f4eaca031de9b98ab3fa65adf6e6ea405e389db94870e962197e2..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 543 zcmV+)0^t3L0vrSY0RjL91p-mfU%CJa2@p8$b$w|VMj%1n5C2L}jNw>za_(+$nX-fU zVH)Y%og?3HOL0i6NU-^L`5#Za=u6I?6rLo1F%dSTO~3&K+Mec)Mv0#}pDBG9(_t&Y z^b3DSLE>%*j;s5L+@7x|Z)u#;S`sH}frjkUoZ+-)f#+v)B z1ly$y$rfWGX(L*&hmq$7?gkh0Ro`eoo*nf2J-!es`Y?O&^bKWwYys)>AHsp3-oWu6 zVJLm4OZm#u_W zCWCMH&R8D`YHK#`>ERH$4h*j3{1sCL|I2RrGDoSneuxSv5SyMp&0M2PGQQm$cI4SS}?MAROk^Ea7xw*kCl8ziw_wTdLvPo~NOysTmzZat5)i zdeF6Ze_L@}1_~rjh$BiL`)CClv$yJ_4_xEV>dsGE&o4M*IcSwHjIyKM)1cqRbB+4v h1oUZ1719JN03vR_Fc(ezL-Ln7RXgp=(%wWF*YOXe2?_uJ diff --git a/xz-5.0.7.tar.gz b/xz-5.0.7.tar.gz new file mode 100644 index 0000000..789d472 --- /dev/null +++ b/xz-5.0.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f4d2165553b9d0d82fd08bc2eacddeb48ebeb862a5686a603f8c044a2e52c93f +size 1317771 diff --git a/xz-5.0.7.tar.gz.sig b/xz-5.0.7.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..a6cbcca098f5a5c70da29b37404c68f04f3411f33c6295c0f7c7d0749b97f121 GIT binary patch literal 543 zcmV+)0^t3L0vrSY0RjL91p-tZzd8U42@p8$b$w|VMj&(h5B(aygVljtP?!q^_ben7 z-qP>wB8&sR$7-&bg00}9MIXoU6HWEBr*;Nav9d!48JSM4o1nq22k2G4cO;+#}rc`ld6rmhihBWHMk3>`pR=f|qSy~gCL)}5H-=IAY$M_UK$l<%laK-;t6og>)vO;w! zsCqN5qqq%xkvhf9F!I{Bd9nEd6m0Vqy*qI<@=^x92Ht=4za)thz60&}aZU_mc++@Q zhP?JVekW6^$vWg55M8*H2?^Va%vd0co0nbg=P&Z#NG zh@%jRgd%Q-4scvjm4Va1#)_{X?JRgZ@no8i_$ur)jowl8PD)|&|K+FeNoPA>l+%vp zgEEUlc26*1FJz_J-{y41@px literal 0 HcmV?d00001 diff --git a/xz.changes b/xz.changes index 1728c06..82656f1 100644 --- a/xz.changes +++ b/xz.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Sep 23 00:11:27 UTC 2014 - andreas.stieger@gmx.de + +- xz 5.0.7: + * Fix regressions introduced in 5.0.6: + - Fix building with non-GNU make. + - Fix invalid Libs.private value in liblzma.pc which broke + static linking against liblzma if the linker flags were + taken from pkg-config. +- include changes from 5.0.6: + * xzgrep now exits with status 0 if at least one file matched. + * A few minor portability and build system fixes + ------------------------------------------------------------------- Sun Nov 24 16:25:53 UTC 2013 - andreas.stieger@gmx.de diff --git a/xz.spec b/xz.spec index 9103b70..17007d7 100644 --- a/xz.spec +++ b/xz.spec @@ -1,7 +1,7 @@ # # spec file for package xz # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -16,6 +16,8 @@ # +# avoid bootstrapping problem +%define _binary_payload w9.bzdio %if 0%{?centos_version} || 0%{?rhel_version} %if 0%{?centos_version} <= 600 || 0%{?rhel_version <= 600} %bcond_without static_libs @@ -23,36 +25,31 @@ %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.0.7 +Release: 0 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/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 -Obsoletes: lzma < %version - -%if 0%{?suse_version} < 1130 -%define do_profiling 0 -%endif -%ifarch aarch64 %{arm} %sparc -%define do_profiling 0 -%endif - +Provides: lzma = %{version} +Obsoletes: lzma < %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?lang_package:1} > 0 -Recommends: %name-lang +Recommends: %{name}-lang %endif -# avoid bootstrapping problem -%define _binary_payload w9.bzdio %description The xz command is a very powerful program for compressing files. @@ -85,23 +82,24 @@ Library for encoding/decoding LZMA files. Summary: Development package for the LZMA library Group: Development/Libraries/C and C++ Requires: liblzma5 = %{version} -Provides: lzma-devel = %version -Obsoletes: lzma-devel < %version -Provides: lzma-alpha-devel = %version -Obsoletes: lzma-alpha-devel < %version +Provides: lzma-devel = %{version} +Obsoletes: lzma-devel < %{version} +Provides: lzma-alpha-devel = %{version} +Obsoletes: lzma-alpha-devel < %{version} %description devel 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 +Requires: lzma-devel = %{version} %description static-devel -Static library for the LZMA library +Static library for the LZMA library %endif %prep @@ -112,25 +110,25 @@ Static library for the LZMA library %if %{do_profiling} profiledir=$(mktemp -d) trap "rm -rf $profiledir" EXIT -export CFLAGS="%optflags %{cflags_profile_generate}=$profiledir" +export CFLAGS="%{optflags} %{cflags_profile_generate}=$profiledir" %endif %configure \ %if ! %{with static_libs} --disable-static \ %endif --with-pic \ - --docdir=%_docdir/%name + --docdir=%{_docdir}/%{name} make %{?_smp_mflags} %if %{do_profiling} time make check -make clean -export CFLAGS="%optflags %{cflags_profile_feedback}=$profiledir" +make clean %{?_smp_mflags} +export CFLAGS="%{optflags} %{cflags_profile_feedback}=$profiledir" %configure \ %if %{without static_libs} --disable-static \ %endif --with-pic \ - --docdir=%_docdir/%name + --docdir=%{_docdir}/%{name} make %{?_smp_mflags} %endif @@ -138,8 +136,8 @@ make %{?_smp_mflags} time make check %install -make install DESTDIR=$RPM_BUILD_ROOT -%{__rm} -v %{buildroot}%{_libdir}/liblzma.la +make DESTDIR=%{buildroot} install %{?_smp_mflags} +rm -v %{buildroot}%{_libdir}/liblzma.la %find_lang %{name} %post -n liblzma5 -p /sbin/ldconfig @@ -152,13 +150,14 @@ make install DESTDIR=$RPM_BUILD_ROOT %defattr(-, root, root) %files +%defattr(-,root,root) %else %files -f %{name}.lang %defattr(-, root, root) %endif %defattr(-, root, root) -%_docdir/%name +%{_docdir}/%{name} %{_bindir}/* %{_mandir}/man?/* @@ -174,6 +173,7 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %if %{with static_libs} + %files static-devel %defattr(-, root, root) %{_libdir}/*.a