From 00a3143ee15e691a4d7d3571453611ef2804a0c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jason=20=E3=83=86=E3=82=A3=E3=83=93=E3=83=84?= Date: Fri, 17 Jul 2009 18:11:44 +0000 Subject: [PATCH 01/67] Setup of module xz --- .cvsignore | 0 Makefile | 21 +++++++++++++++++++++ sources | 0 3 files changed, 21 insertions(+) create mode 100644 .cvsignore create mode 100644 Makefile create mode 100644 sources diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..32424f3 --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: xz +# $Id$ +NAME := xz +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From b0e6e16d91963ecda30741890df59f53ff98806a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 17 Jul 2009 18:19:25 +0000 Subject: [PATCH 02/67] Initial import of xz. --- .cvsignore | 1 + import.log | 1 + sources | 1 + xz.spec | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 132 insertions(+) create mode 100644 import.log create mode 100644 xz.spec diff --git a/.cvsignore b/.cvsignore index e69de29..a05fdbf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +xz-4.999.8beta.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..9670702 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +xz-4_999_8-0_7_beta_fc11:HEAD:xz-4.999.8-0.7.beta.fc11.src.rpm:1247854742 diff --git a/sources b/sources index e69de29..277250f 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +f00967331a487e88d51207fe17c56f52 xz-4.999.8beta.tar.gz diff --git a/xz.spec b/xz.spec new file mode 100644 index 0000000..2495a3a --- /dev/null +++ b/xz.spec @@ -0,0 +1,129 @@ +Summary: LZMA compression utilities +Name: xz +Version: 4.999.8 +Release: 0.7.beta%{?dist} +License: LGPLv2+ +Group: Applications/File +Source0: http://tukaani.org/%{name}/%{name}-%{version}beta.tar.gz +URL: http://tukaani.org/%{name}/ +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: %{name}-libs = %{version}-%{release} + +%description +XZ Utils are an attempt to make LZMA compression easy to use on free (as in +freedom) operating systems. This is achieved by providing tools and libraries +which are similar to use than the equivalents of the most popular existing +compression algorithms. + +LZMA is a general purpose compression algorithm designed by Igor Pavlov as +part of 7-Zip. It provides high compression ratio while keeping the +decompression speed fast. + +%package libs +Summary: Libraries for decoding LZMA compression +Group: System Environment/Libraries +License: LGPLv2+ + +%description libs +Libraries for decoding files compressed with LZMA or XZ utils. + +%package devel +Summary: Devel libraries & headers for liblzma +Group: Development/Libraries +License: LGPLv2+ +Requires: %{name}-libs = %{version}-%{release} +Requires: pkgconfig + +%description devel +Devel libraries and headers for liblzma. + +%package lzma-compat +Summary: Older LZMA format compatibility binaries +Group: Development/Libraries +# lz{grep,diff,more} are GPLv2+. Other binaries are LGPLv2+ +License: GPLv2+ and LGPLv2+ +Requires: %{name} = %{version}-%{release} +Obsoletes: lzma < 5 +Provides: lzma = 5 + +%description lzma-compat +The lzma-compat package contains compatibility links for older +commands that deal with the older LZMA format. + +%prep +%setup -q -n %{name}-%{version}beta + +%build +CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64" \ +CXXFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64" \ +%configure --disable-static +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + +make %{?_smp_mflags} + +%install +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" +rm -f %{buildroot}/%{_libdir}/*.a +rm -f %{buildroot}/%{_libdir}/*.la + +%check +LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check + +%clean +rm -rf %{buildroot} + +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc AUTHORS README THANKS COPYING.* ChangeLog +%{_bindir}/*xz* + +%files libs +%defattr(-,root,root,-) +%doc COPYING.* +%{_libdir}/lib*.so.* + +%files devel +%defattr(-,root,root,-) +%dir %{_includedir}/lzma +%{_includedir}/lzma/*.h +%{_includedir}/lzma.h +%{_libdir}/*.so +%{_libdir}/pkgconfig/liblzma.pc + +%files lzma-compat +%defattr(-,root,root,-) +%{_bindir}/*lz* +%{_mandir}/man1/* + +%changelog +* Fri Jul 17 2009 Bill Nottingham 4.999.8-0.7.beta +- tweak summary +- add %%check section () + +* Thu Jul 09 2009 Bill Nottingham 4.999.8-0.6.beta +- fix release versioning to match guidelines +- fix up lzma-compat summary/description +- tweak licensing + +* Mon Jun 22 2009 Jindrich Novy 4.999.8beta-0.5 +- introduce lzma-compat subpackage + +* Fri Jun 19 2009 Jindrich Novy 4.999.8beta-0.4 +- try to not to conflict with lzma + +* Thu Jun 18 2009 Jindrich Novy 4.999.8beta-0.3 +- obsolete but don't provide lzma, they are largely incompatible +- put beta to Release + +* Wed Jun 17 2009 Jindrich Novy 4.999.8beta-0.2 +- obsolete old lzma +- add Requires: pkgconfig + +* Tue Jun 16 2009 Jindrich Novy 4.999.8beta-0.1 +- package XZ Utils, based on LZMA Utils packaged by Per Patrice Bouchand From 79a49305ed23abb6fcbc595fa7312893c31d874b Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 08:50:20 +0000 Subject: [PATCH 03/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- xz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xz.spec b/xz.spec index 2495a3a..50baff7 100644 --- a/xz.spec +++ b/xz.spec @@ -1,7 +1,7 @@ Summary: LZMA compression utilities Name: xz Version: 4.999.8 -Release: 0.7.beta%{?dist} +Release: 0.8.beta%{?dist} License: LGPLv2+ Group: Applications/File Source0: http://tukaani.org/%{name}/%{name}-%{version}beta.tar.gz @@ -102,6 +102,9 @@ rm -rf %{buildroot} %{_mandir}/man1/* %changelog +* Mon Jul 27 2009 Fedora Release Engineering - 4.999.8-0.8.beta +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Fri Jul 17 2009 Bill Nottingham 4.999.8-0.7.beta - tweak summary - add %%check section () From e9575d344db9f4ebb494dd9075183b4073de097d Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Wed, 5 Aug 2009 13:54:59 +0000 Subject: [PATCH 04/67] - update to the latest GIT snapshot --- .cvsignore | 2 +- sources | 2 +- xz.spec | 11 +++++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index a05fdbf..b0ed23f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xz-4.999.8beta.tar.gz +xz-4.999.8beta.20090804git.tar.gz diff --git a/sources b/sources index 277250f..ebb9616 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f00967331a487e88d51207fe17c56f52 xz-4.999.8beta.tar.gz +5efad2a123674034cb0c5a5794686e7a xz-4.999.8beta.20090804git.tar.gz diff --git a/xz.spec b/xz.spec index 50baff7..2090789 100644 --- a/xz.spec +++ b/xz.spec @@ -1,10 +1,13 @@ +%define git_date 20090804 + Summary: LZMA compression utilities Name: xz Version: 4.999.8 -Release: 0.8.beta%{?dist} +Release: 0.9.beta.%{git_date}git%{?dist} License: LGPLv2+ Group: Applications/File -Source0: http://tukaani.org/%{name}/%{name}-%{version}beta.tar.gz +# source created as "make dist" in checked out GIT tree +Source0: http://tukaani.org/%{name}/%{name}-%{version}beta.%{git_date}git.tar.gz URL: http://tukaani.org/%{name}/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-libs = %{version}-%{release} @@ -67,6 +70,7 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" rm -f %{buildroot}/%{_libdir}/*.a rm -f %{buildroot}/%{_libdir}/*.la +rm -rf %{buildroot}/%{_docdir}/%{name} %check LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check @@ -102,6 +106,9 @@ rm -rf %{buildroot} %{_mandir}/man1/* %changelog +* Tue Aug 04 2009 Jindrich Novy 4.999.8-0.9.beta.20090804git +- update to the latest GIT snapshot + * Mon Jul 27 2009 Fedora Release Engineering - 4.999.8-0.8.beta - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 2eacfeecf2719bfc955469ab4a2902f76d1e1b6a Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Mon, 17 Aug 2009 10:26:48 +0000 Subject: [PATCH 05/67] - sync with upstream because of #517806 --- .cvsignore | 2 +- sources | 2 +- xz.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index b0ed23f..9151d97 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xz-4.999.8beta.20090804git.tar.gz +xz-4.999.8beta.20090817git.tar.gz diff --git a/sources b/sources index ebb9616..85dbddb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5efad2a123674034cb0c5a5794686e7a xz-4.999.8beta.20090804git.tar.gz +d0065a7471d2d069e2c56242c653f36a xz-4.999.8beta.20090817git.tar.gz diff --git a/xz.spec b/xz.spec index 2090789..1f31848 100644 --- a/xz.spec +++ b/xz.spec @@ -1,9 +1,9 @@ -%define git_date 20090804 +%define git_date 20090817 Summary: LZMA compression utilities Name: xz Version: 4.999.8 -Release: 0.9.beta.%{git_date}git%{?dist} +Release: 0.10.beta.%{git_date}git%{?dist} License: LGPLv2+ Group: Applications/File # source created as "make dist" in checked out GIT tree @@ -106,6 +106,9 @@ rm -rf %{buildroot} %{_mandir}/man1/* %changelog +* Mon Aug 17 2009 Jindrich Novy 4.999.8-0.10.beta.20090817git +- sync with upstream because of #517806 + * Tue Aug 04 2009 Jindrich Novy 4.999.8-0.9.beta.20090804git - update to the latest GIT snapshot From d0946b8a9890671398b5f2a6b6b7f64b3cfe139a Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Fri, 28 Aug 2009 02:33:26 +0000 Subject: [PATCH 06/67] - sync with upstream because of #517806 --- .cvsignore | 2 +- sources | 2 +- xz.spec | 13 +++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9151d97..7e67c9a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xz-4.999.8beta.20090817git.tar.gz +xz-4.999.9beta.tar.xz diff --git a/sources b/sources index 85dbddb..c1c6928 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d0065a7471d2d069e2c56242c653f36a xz-4.999.8beta.20090817git.tar.gz +62459762f5ac6055051f2929191cd159 xz-4.999.9beta.tar.xz diff --git a/xz.spec b/xz.spec index 1f31848..03f7c85 100644 --- a/xz.spec +++ b/xz.spec @@ -1,13 +1,11 @@ -%define git_date 20090817 - Summary: LZMA compression utilities Name: xz -Version: 4.999.8 -Release: 0.10.beta.%{git_date}git%{?dist} +Version: 4.999.9 +Release: 0.1.beta%{?dist} License: LGPLv2+ Group: Applications/File # source created as "make dist" in checked out GIT tree -Source0: http://tukaani.org/%{name}/%{name}-%{version}beta.%{git_date}git.tar.gz +Source0: http://tukaani.org/%{name}/%{name}-%{version}beta.tar.xz URL: http://tukaani.org/%{name}/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-libs = %{version}-%{release} @@ -54,7 +52,7 @@ The lzma-compat package contains compatibility links for older commands that deal with the older LZMA format. %prep -%setup -q -n %{name}-%{version}beta +%setup -q -n %{name}-%{version}beta %build CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64" \ @@ -106,6 +104,9 @@ rm -rf %{buildroot} %{_mandir}/man1/* %changelog +* Fri Aug 28 2009 Jindrich Novy 4.999.9-0.1.beta +- update to 4.999.9beta + * Mon Aug 17 2009 Jindrich Novy 4.999.8-0.10.beta.20090817git - sync with upstream because of #517806 From c89b152cad7021591a770facdf3f47297dbc05d5 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Fri, 2 Oct 2009 08:25:15 +0000 Subject: [PATCH 07/67] - sync with upstream to generate the same archives on machines with different endianess --- .cvsignore | 2 +- sources | 2 +- xz.spec | 10 ++++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7e67c9a..4480fc3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xz-4.999.9beta.tar.xz +xz-4.999.9beta.20091002git.tar.gz diff --git a/sources b/sources index c1c6928..269448f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -62459762f5ac6055051f2929191cd159 xz-4.999.9beta.tar.xz +5831d58c3dfe600759e8232a1f192dc7 xz-4.999.9beta.20091002git.tar.gz diff --git a/xz.spec b/xz.spec index 03f7c85..0fe92bf 100644 --- a/xz.spec +++ b/xz.spec @@ -1,11 +1,13 @@ +%define git_date 20091002 + Summary: LZMA compression utilities Name: xz Version: 4.999.9 -Release: 0.1.beta%{?dist} +Release: 0.1.beta.%{git_date}git%{?dist} License: LGPLv2+ Group: Applications/File # source created as "make dist" in checked out GIT tree -Source0: http://tukaani.org/%{name}/%{name}-%{version}beta.tar.xz +Source0: http://tukaani.org/%{name}/%{name}-%{version}beta.%{git_date}git.tar.gz URL: http://tukaani.org/%{name}/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-libs = %{version}-%{release} @@ -104,6 +106,10 @@ rm -rf %{buildroot} %{_mandir}/man1/* %changelog +* Fri Oct 02 2009 Jindrich Novy 4.999.9-0.1.20091002.beta +- sync with upstream to generate the same archives on machines with different + endianess + * Fri Aug 28 2009 Jindrich Novy 4.999.9-0.1.beta - update to 4.999.9beta From 7dc0cee99caf1fcb2e24602dfd7e63a759e94bfb Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Wed, 7 Oct 2009 06:01:09 +0000 Subject: [PATCH 08/67] - sync with upstream again --- .cvsignore | 2 +- sources | 2 +- xz.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4480fc3..e711073 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xz-4.999.9beta.20091002git.tar.gz +xz-4.999.9beta.20091007git.tar.xz diff --git a/sources b/sources index 269448f..57fe8a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5831d58c3dfe600759e8232a1f192dc7 xz-4.999.9beta.20091002git.tar.gz +8bd02e5301cb9631852a898d750111d9 xz-4.999.9beta.20091007git.tar.xz diff --git a/xz.spec b/xz.spec index 0fe92bf..7fb9574 100644 --- a/xz.spec +++ b/xz.spec @@ -1,4 +1,4 @@ -%define git_date 20091002 +%define git_date 20091007 Summary: LZMA compression utilities Name: xz @@ -7,7 +7,7 @@ Release: 0.1.beta.%{git_date}git%{?dist} License: LGPLv2+ Group: Applications/File # source created as "make dist" in checked out GIT tree -Source0: http://tukaani.org/%{name}/%{name}-%{version}beta.%{git_date}git.tar.gz +Source0: http://tukaani.org/%{name}/%{name}-%{version}beta.%{git_date}git.tar.xz URL: http://tukaani.org/%{name}/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-libs = %{version}-%{release} @@ -106,6 +106,9 @@ rm -rf %{buildroot} %{_mandir}/man1/* %changelog +* Wed Oct 07 2009 Jindrich Novy 4.999.9-0.1.20091007.beta +- sync with upstream again + * Fri Oct 02 2009 Jindrich Novy 4.999.9-0.1.20091002.beta - sync with upstream to generate the same archives on machines with different endianess From b82958f6a46098bb84f6e5f067a270d69fda8087 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:41:08 +0000 Subject: [PATCH 09/67] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 32424f3..8db6cae 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := xz SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 94b5c3a537be4f2e9b7f531b57984c034df3acc3 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Thu, 18 Feb 2010 20:58:54 +0000 Subject: [PATCH 10/67] - move xz man pages to main package, leave lzma ones where they belong (#566484) --- xz.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xz.spec b/xz.spec index 7fb9574..6e23058 100644 --- a/xz.spec +++ b/xz.spec @@ -3,7 +3,7 @@ Summary: LZMA compression utilities Name: xz Version: 4.999.9 -Release: 0.1.beta.%{git_date}git%{?dist} +Release: 0.2.beta.%{git_date}git%{?dist} License: LGPLv2+ Group: Applications/File # source created as "make dist" in checked out GIT tree @@ -86,6 +86,7 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %doc AUTHORS README THANKS COPYING.* ChangeLog %{_bindir}/*xz* +%{_mandir}/man1/*xz* %files libs %defattr(-,root,root,-) @@ -103,9 +104,12 @@ rm -rf %{buildroot} %files lzma-compat %defattr(-,root,root,-) %{_bindir}/*lz* -%{_mandir}/man1/* +%{_mandir}/man1/*lz* %changelog +* Thu Feb 18 2010 Jindrich Novy 4.999.9-0.2.20091007.beta +- move xz man pages to main package, leave lzma ones where they belong (#566484) + * Wed Oct 07 2009 Jindrich Novy 4.999.9-0.1.20091007.beta - sync with upstream again From c10ae9446b311e1233efc3c22ca906ccd75eeeb6 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Thu, 1 Apr 2010 19:10:00 +0000 Subject: [PATCH 11/67] - sync with upstream (#578925) --- .cvsignore | 2 +- sources | 2 +- xz.spec | 12 ++++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index e711073..fd90466 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xz-4.999.9beta.20091007git.tar.xz +xz-4.999.9beta.20100401git.tar.xz diff --git a/sources b/sources index 57fe8a7..f6ae8d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8bd02e5301cb9631852a898d750111d9 xz-4.999.9beta.20091007git.tar.xz +b136554a69e1a7e6eb371302c0d75c06 xz-4.999.9beta.20100401git.tar.xz diff --git a/xz.spec b/xz.spec index 6e23058..98e17db 100644 --- a/xz.spec +++ b/xz.spec @@ -1,4 +1,4 @@ -%define git_date 20091007 +%define git_date 20100401 Summary: LZMA compression utilities Name: xz @@ -68,9 +68,10 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" -rm -f %{buildroot}/%{_libdir}/*.a -rm -f %{buildroot}/%{_libdir}/*.la -rm -rf %{buildroot}/%{_docdir}/%{name} +rm -f %{buildroot}%{_libdir}/*.a +rm -f %{buildroot}%{_libdir}/*.la +rm -rf %{buildroot}%{_docdir}/%{name} +rm -rf %{buildroot}%{_datadir}/locale %check LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check @@ -107,6 +108,9 @@ rm -rf %{buildroot} %{_mandir}/man1/*lz* %changelog +* Thu Apr 01 2010 Jindrich Novy 4.999.9-0.2.20100401.beta +- sync with upstream (#578925) + * Thu Feb 18 2010 Jindrich Novy 4.999.9-0.2.20091007.beta - move xz man pages to main package, leave lzma ones where they belong (#566484) From 6cccfb7a4d760be5e8354f9a9dbce3385ca95fc2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:17:34 +0000 Subject: [PATCH 12/67] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 8db6cae..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xz -# $Id$ -NAME := xz -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index 9670702..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -xz-4_999_8-0_7_beta_fc11:HEAD:xz-4.999.8-0.7.beta.fc11.src.rpm:1247854742 From 09a5ed2c814546c432f1248d5ff07033170d4a9d Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Sat, 16 Oct 2010 07:33:33 +0200 Subject: [PATCH 13/67] update to latest git snapshot --- .gitignore | 2 +- sources | 2 +- xz.spec | 12 +++++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index fd90466..438916c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -xz-4.999.9beta.20100401git.tar.xz +xz-4.999.9beta-212-gacbc.tar.gz diff --git a/sources b/sources index f6ae8d7..9a2f830 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b136554a69e1a7e6eb371302c0d75c06 xz-4.999.9beta.20100401git.tar.xz +9b475359622f67aea6774139585d5e33 xz-4.999.9beta-212-gacbc.tar.gz diff --git a/xz.spec b/xz.spec index 98e17db..eee6bef 100644 --- a/xz.spec +++ b/xz.spec @@ -1,13 +1,12 @@ -%define git_date 20100401 - +%define git_hash acbc Summary: LZMA compression utilities Name: xz Version: 4.999.9 -Release: 0.2.beta.%{git_date}git%{?dist} +Release: 0.3.beta.212.g%{git_hash}%{?dist} License: LGPLv2+ Group: Applications/File # source created as "make dist" in checked out GIT tree -Source0: http://tukaani.org/%{name}/%{name}-%{version}beta.%{git_date}git.tar.xz +Source0: http://tukaani.org/%{name}/%{name}-%{version}beta-212-g%{git_hash}.tar.gz URL: http://tukaani.org/%{name}/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-libs = %{version}-%{release} @@ -54,7 +53,7 @@ The lzma-compat package contains compatibility links for older commands that deal with the older LZMA format. %prep -%setup -q -n %{name}-%{version}beta +%setup -q -n %{name}-%{version}beta-212-g%{git_hash} %build CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64" \ @@ -108,6 +107,9 @@ rm -rf %{buildroot} %{_mandir}/man1/*lz* %changelog +* Sat Oct 16 2010 Jindrich Novy 4.999.9-0.3.beta.212.gacbc +- update to latest git snapshot + * Thu Apr 01 2010 Jindrich Novy 4.999.9-0.2.20100401.beta - sync with upstream (#578925) From e01c981e24640a440cc22f51d41a2523de74ac76 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Mon, 25 Oct 2010 17:25:33 +0200 Subject: [PATCH 14/67] update to xz-5.0.0 --- .gitignore | 2 +- sources | 2 +- xz.spec | 20 +++++++++++--------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 438916c..c49f8e9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -xz-4.999.9beta-212-gacbc.tar.gz +xz-5.0.0.tar.xz diff --git a/sources b/sources index 9a2f830..b6a976b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9b475359622f67aea6774139585d5e33 xz-4.999.9beta-212-gacbc.tar.gz +5d4b128e1cefa301a232a4817bdbfc03 xz-5.0.0.tar.xz diff --git a/xz.spec b/xz.spec index eee6bef..8f26deb 100644 --- a/xz.spec +++ b/xz.spec @@ -1,12 +1,11 @@ -%define git_hash acbc Summary: LZMA compression utilities Name: xz -Version: 4.999.9 -Release: 0.3.beta.212.g%{git_hash}%{?dist} +Version: 5.0.0 +Release: 1%{?dist} License: LGPLv2+ Group: Applications/File # source created as "make dist" in checked out GIT tree -Source0: http://tukaani.org/%{name}/%{name}-%{version}beta-212-g%{git_hash}.tar.gz +Source0: http://tukaani.org/%{name}/%{name}-%{version}.tar.xz URL: http://tukaani.org/%{name}/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-libs = %{version}-%{release} @@ -45,15 +44,15 @@ Group: Development/Libraries # lz{grep,diff,more} are GPLv2+. Other binaries are LGPLv2+ License: GPLv2+ and LGPLv2+ Requires: %{name} = %{version}-%{release} -Obsoletes: lzma < 5 -Provides: lzma = 5 +Obsoletes: lzma < %{version} +Provides: lzma = %{version} %description lzma-compat The lzma-compat package contains compatibility links for older commands that deal with the older LZMA format. %prep -%setup -q -n %{name}-%{version}beta-212-g%{git_hash} +%setup -q %build CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64" \ @@ -84,13 +83,13 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc AUTHORS README THANKS COPYING.* ChangeLog +%doc AUTHORS COPYING* ChangeLog NEWS README THANKS TODO %{_bindir}/*xz* %{_mandir}/man1/*xz* %files libs %defattr(-,root,root,-) -%doc COPYING.* +%doc COPYING* %{_libdir}/lib*.so.* %files devel @@ -107,6 +106,9 @@ rm -rf %{buildroot} %{_mandir}/man1/*lz* %changelog +* Mon Oct 25 2010 Jindrich Novy 5.0.0-1 +- update to the new upstream release + * Sat Oct 16 2010 Jindrich Novy 4.999.9-0.3.beta.212.gacbc - update to latest git snapshot From 796290b6e37793039965f58f99e86e640f20e5e5 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Mon, 25 Oct 2010 19:01:02 +0200 Subject: [PATCH 15/67] rebuild --- xz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xz.spec b/xz.spec index 8f26deb..aab3440 100644 --- a/xz.spec +++ b/xz.spec @@ -1,7 +1,7 @@ Summary: LZMA compression utilities Name: xz Version: 5.0.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: Applications/File # source created as "make dist" in checked out GIT tree @@ -106,6 +106,9 @@ rm -rf %{buildroot} %{_mandir}/man1/*lz* %changelog +* Mon Oct 25 2010 Jindrich Novy 5.0.0-2 +- rebuild + * Mon Oct 25 2010 Jindrich Novy 5.0.0-1 - update to the new upstream release From d0b81acc4dbe4baa327c0c8d93db2de0d8baca3b Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Tue, 26 Oct 2010 10:26:11 +0200 Subject: [PATCH 16/67] introduce compat-libs subpackage with older library - to resolve problems with soname bump - for packages requiring older xz-4.999.9beta --- .gitignore | 1 + sources | 1 + xz.spec | 44 +++++++++++++++++++++++++++++++++++++------- 3 files changed, 39 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index c49f8e9..9b609b2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ xz-5.0.0.tar.xz +xz-4.999.9beta.20100401git.tar.xz diff --git a/sources b/sources index b6a976b..547f018 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 5d4b128e1cefa301a232a4817bdbfc03 xz-5.0.0.tar.xz +b136554a69e1a7e6eb371302c0d75c06 xz-4.999.9beta.20100401git.tar.xz diff --git a/xz.spec b/xz.spec index aab3440..31fc440 100644 --- a/xz.spec +++ b/xz.spec @@ -1,11 +1,15 @@ +%global compat_ver xz-4.999.9beta + Summary: LZMA compression utilities Name: xz Version: 5.0.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: Applications/File -# source created as "make dist" in checked out GIT tree +# official upstream release Source0: http://tukaani.org/%{name}/%{name}-%{version}.tar.xz +# source created as "make dist" in checked out GIT tree +Source1: %{compat_ver}.20100401git.tar.xz URL: http://tukaani.org/%{name}/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-libs = %{version}-%{release} @@ -28,6 +32,15 @@ License: LGPLv2+ %description libs Libraries for decoding files compressed with LZMA or XZ utils. +%package compat-libs +Summary: Compatibility libraries for decoding LZMA compression +Group: System Environment/Libraries +License: LGPLv2+ + +%description compat-libs +Compatibility libraries for decoding files compressed with LZMA or XZ utils. +This particular package ships libraries from xz-%{compat_ver} as of 1st of April 2010. + %package devel Summary: Devel libraries & headers for liblzma Group: Development/Libraries @@ -35,7 +48,7 @@ License: LGPLv2+ Requires: %{name}-libs = %{version}-%{release} Requires: pkgconfig -%description devel +%description devel Devel libraries and headers for liblzma. %package lzma-compat @@ -47,12 +60,12 @@ Requires: %{name} = %{version}-%{release} Obsoletes: lzma < %{version} Provides: lzma = %{version} -%description lzma-compat +%description lzma-compat The lzma-compat package contains compatibility links for older commands that deal with the older LZMA format. %prep -%setup -q +%setup -q -a1 %build CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64" \ @@ -60,9 +73,15 @@ CXXFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64" \ %configure --disable-static sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool - make %{?_smp_mflags} +pushd %{compat_ver} +%configure --disable-static +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +make %{?_smp_mflags} +popd + %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" @@ -70,6 +89,7 @@ rm -f %{buildroot}%{_libdir}/*.a rm -f %{buildroot}%{_libdir}/*.la rm -rf %{buildroot}%{_docdir}/%{name} rm -rf %{buildroot}%{_datadir}/locale +cp -r %{compat_ver}/src/liblzma/.libs/liblzma.so.0* %{buildroot}%{_libdir} %check LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check @@ -90,7 +110,12 @@ rm -rf %{buildroot} %files libs %defattr(-,root,root,-) %doc COPYING* -%{_libdir}/lib*.so.* +%{_libdir}/lib*.so.5* + +%files compat-libs +%defattr(-,root,root,-) +%doc COPYING* +%{_libdir}/lib*.so.0* %files devel %defattr(-,root,root,-) @@ -106,6 +131,11 @@ rm -rf %{buildroot} %{_mandir}/man1/*lz* %changelog +* Mon Oct 25 2010 Jindrich Novy 5.0.0-3 +- introduce compat-libs subpackage with older soname to + resolve problems with soname bump and for packages requiring + older xz-4.999.9beta + * Mon Oct 25 2010 Jindrich Novy 5.0.0-2 - rebuild From 609b71d4c826ba924a2738e448a2ba6e71d63f76 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Tue, 26 Oct 2010 13:34:57 +0200 Subject: [PATCH 17/67] call ldconfig for compat-libs and fix description --- xz.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/xz.spec b/xz.spec index 31fc440..6d63315 100644 --- a/xz.spec +++ b/xz.spec @@ -3,7 +3,7 @@ Summary: LZMA compression utilities Name: xz Version: 5.0.0 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ Group: Applications/File # official upstream release @@ -39,7 +39,7 @@ License: LGPLv2+ %description compat-libs Compatibility libraries for decoding files compressed with LZMA or XZ utils. -This particular package ships libraries from xz-%{compat_ver} as of 1st of April 2010. +This particular package ships libraries from %{compat_ver} as of 1st of April 2010. %package devel Summary: Devel libraries & headers for liblzma @@ -101,6 +101,10 @@ rm -rf %{buildroot} %postun libs -p /sbin/ldconfig +%post compat-libs -p /sbin/ldconfig + +%postun compat-libs -p /sbin/ldconfig + %files %defattr(-,root,root,-) %doc AUTHORS COPYING* ChangeLog NEWS README THANKS TODO @@ -131,6 +135,9 @@ rm -rf %{buildroot} %{_mandir}/man1/*lz* %changelog +* Tue Oct 26 2010 Jindrich Novy 5.0.0-4 +- call ldconfig for compat-libs and fix description + * Mon Oct 25 2010 Jindrich Novy 5.0.0-3 - introduce compat-libs subpackage with older soname to resolve problems with soname bump and for packages requiring From 9f9e6acd30af5f7ed7a57ce821dd823717eee615 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Sat, 29 Jan 2011 17:15:53 +0100 Subject: [PATCH 18/67] update to 5.0.1 --- .gitignore | 1 + sources | 3 +-- xz.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9b609b2..2a4b86c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ xz-5.0.0.tar.xz xz-4.999.9beta.20100401git.tar.xz +/xz-5.0.1.tar.xz diff --git a/sources b/sources index 547f018..5f64a90 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -5d4b128e1cefa301a232a4817bdbfc03 xz-5.0.0.tar.xz -b136554a69e1a7e6eb371302c0d75c06 xz-4.999.9beta.20100401git.tar.xz +85d15b01a405616a888d09e19fb40f31 xz-5.0.1.tar.xz diff --git a/xz.spec b/xz.spec index 6d63315..f7536ff 100644 --- a/xz.spec +++ b/xz.spec @@ -2,8 +2,8 @@ Summary: LZMA compression utilities Name: xz -Version: 5.0.0 -Release: 4%{?dist} +Version: 5.0.1 +Release: 1%{?dist} License: LGPLv2+ Group: Applications/File # official upstream release @@ -135,6 +135,9 @@ rm -rf %{buildroot} %{_mandir}/man1/*lz* %changelog +* Sat Jan 29 2011 Jindrich Novy 5.0.1-1 +- update to 5.0.1 + * Tue Oct 26 2010 Jindrich Novy 5.0.0-4 - call ldconfig for compat-libs and fix description From 70872ab2cf96785727510ccd055fe537c1490e90 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Sat, 29 Jan 2011 17:35:50 +0100 Subject: [PATCH 19/67] return back LZMA compatibility tarball --- .gitignore | 3 +-- sources | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2a4b86c..5baee3c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ -xz-5.0.0.tar.xz -xz-4.999.9beta.20100401git.tar.xz /xz-5.0.1.tar.xz +/xz-4.999.9beta.20100401git.tar.xz diff --git a/sources b/sources index 5f64a90..c6db1b1 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 85d15b01a405616a888d09e19fb40f31 xz-5.0.1.tar.xz +b136554a69e1a7e6eb371302c0d75c06 xz-4.999.9beta.20100401git.tar.xz From 1232e46138670a535d40ce3b03e7aad60047bea0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 01:13:56 -0600 Subject: [PATCH 20/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- xz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xz.spec b/xz.spec index f7536ff..98fae0a 100644 --- a/xz.spec +++ b/xz.spec @@ -3,7 +3,7 @@ Summary: LZMA compression utilities Name: xz Version: 5.0.1 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: Applications/File # official upstream release @@ -135,6 +135,9 @@ rm -rf %{buildroot} %{_mandir}/man1/*lz* %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 5.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sat Jan 29 2011 Jindrich Novy 5.0.1-1 - update to 5.0.1 From d4141b09b591975e581a15a80be65cb097236a52 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Mon, 4 Apr 2011 12:54:21 +0200 Subject: [PATCH 21/67] update to 5.0.2 --- .gitignore | 2 +- sources | 2 +- xz.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5baee3c..f0a50c1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/xz-5.0.1.tar.xz /xz-4.999.9beta.20100401git.tar.xz +/xz-5.0.2.tar.xz diff --git a/sources b/sources index c6db1b1..7106387 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -85d15b01a405616a888d09e19fb40f31 xz-5.0.1.tar.xz b136554a69e1a7e6eb371302c0d75c06 xz-4.999.9beta.20100401git.tar.xz +870d0e6fec3b710903371defb48a2fad xz-5.0.2.tar.xz diff --git a/xz.spec b/xz.spec index 98fae0a..b245a8e 100644 --- a/xz.spec +++ b/xz.spec @@ -2,8 +2,8 @@ Summary: LZMA compression utilities Name: xz -Version: 5.0.1 -Release: 2%{?dist} +Version: 5.0.2 +Release: 1%{?dist} License: LGPLv2+ Group: Applications/File # official upstream release @@ -135,6 +135,9 @@ rm -rf %{buildroot} %{_mandir}/man1/*lz* %changelog +* Mon Apr 04 2011 Jindrich Novy 5.0.2-1 +- update to 5.0.2 + * Tue Feb 08 2011 Fedora Release Engineering - 5.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From f711a84f735114d8cf43a46adb962c127d409090 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Mon, 23 May 2011 12:26:28 +0200 Subject: [PATCH 22/67] update to 5.0.3 --- .gitignore | 2 +- sources | 2 +- xz.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f0a50c1..a5774a2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /xz-4.999.9beta.20100401git.tar.xz -/xz-5.0.2.tar.xz +/xz-5.0.3.tar.xz diff --git a/sources b/sources index 7106387..5ae45ce 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ b136554a69e1a7e6eb371302c0d75c06 xz-4.999.9beta.20100401git.tar.xz -870d0e6fec3b710903371defb48a2fad xz-5.0.2.tar.xz +bec7f7985dd79f97aa10ff8305a3a770 xz-5.0.3.tar.xz diff --git a/xz.spec b/xz.spec index b245a8e..a428268 100644 --- a/xz.spec +++ b/xz.spec @@ -2,7 +2,7 @@ Summary: LZMA compression utilities Name: xz -Version: 5.0.2 +Version: 5.0.3 Release: 1%{?dist} License: LGPLv2+ Group: Applications/File @@ -135,6 +135,9 @@ rm -rf %{buildroot} %{_mandir}/man1/*lz* %changelog +* Mon May 23 2011 Jindrich Novy 5.0.3-1 +- update to 5.0.3 + * Mon Apr 04 2011 Jindrich Novy 5.0.2-1 - update to 5.0.2 From 3e3d1190f5010915064dd0e0fe23b1b75bff63e3 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Mon, 20 Jun 2011 19:59:40 +0200 Subject: [PATCH 23/67] tarball format is now bz2 to allow bootstrapping (#714765) --- .gitignore | 4 ++-- sources | 4 ++-- xz.spec | 10 +++++++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index a5774a2..36d1116 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/xz-4.999.9beta.20100401git.tar.xz -/xz-5.0.3.tar.xz +/xz-4.999.9beta.20100401git.tar.bz2 +/xz-5.0.3.tar.bz2 diff --git a/sources b/sources index 5ae45ce..9c7dfc8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -b136554a69e1a7e6eb371302c0d75c06 xz-4.999.9beta.20100401git.tar.xz -bec7f7985dd79f97aa10ff8305a3a770 xz-5.0.3.tar.xz +3aa7bbfaa2d5a87f65c23224b9016006 xz-4.999.9beta.20100401git.tar.bz2 +8d900b742b94fa9e708ca4f5a4b29003 xz-5.0.3.tar.bz2 diff --git a/xz.spec b/xz.spec index a428268..fb80eea 100644 --- a/xz.spec +++ b/xz.spec @@ -3,13 +3,13 @@ Summary: LZMA compression utilities Name: xz Version: 5.0.3 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: Applications/File # official upstream release -Source0: http://tukaani.org/%{name}/%{name}-%{version}.tar.xz +Source0: http://tukaani.org/%{name}/%{name}-%{version}.tar.bz2 # source created as "make dist" in checked out GIT tree -Source1: %{compat_ver}.20100401git.tar.xz +Source1: %{compat_ver}.20100401git.tar.bz2 URL: http://tukaani.org/%{name}/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-libs = %{version}-%{release} @@ -135,6 +135,10 @@ rm -rf %{buildroot} %{_mandir}/man1/*lz* %changelog +* Mon Jun 20 2011 Jindrich Novy 5.0.3-2 +- better to have upstream tarballs in different formats than XZ + to allow bootstrapping (#714765) + * Mon May 23 2011 Jindrich Novy 5.0.3-1 - update to 5.0.3 From 2a1159f58b4be5ae479b46a64287e8a29ac1ae30 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Sun, 16 Oct 2011 11:44:34 +0200 Subject: [PATCH 24/67] update to 5.1.1alpha --- .gitignore | 2 +- sources | 2 +- xz.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 36d1116..58e3cb6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /xz-4.999.9beta.20100401git.tar.bz2 -/xz-5.0.3.tar.bz2 +/xz-5.1.1alpha.tar.gz diff --git a/sources b/sources index 9c7dfc8..4583df5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 3aa7bbfaa2d5a87f65c23224b9016006 xz-4.999.9beta.20100401git.tar.bz2 -8d900b742b94fa9e708ca4f5a4b29003 xz-5.0.3.tar.bz2 +bb24436fa12780808e1c142980484104 xz-5.1.1alpha.tar.gz diff --git a/xz.spec b/xz.spec index fb80eea..bb6f9e6 100644 --- a/xz.spec +++ b/xz.spec @@ -2,12 +2,12 @@ Summary: LZMA compression utilities Name: xz -Version: 5.0.3 -Release: 2%{?dist} +Version: 5.1.1 +Release: 1alpha%{?dist} License: LGPLv2+ Group: Applications/File # official upstream release -Source0: http://tukaani.org/%{name}/%{name}-%{version}.tar.bz2 +Source0: http://tukaani.org/%{name}/%{name}-%{version}alpha.tar.gz # source created as "make dist" in checked out GIT tree Source1: %{compat_ver}.20100401git.tar.bz2 URL: http://tukaani.org/%{name}/ @@ -65,7 +65,7 @@ The lzma-compat package contains compatibility links for older commands that deal with the older LZMA format. %prep -%setup -q -a1 +%setup -q -a1 -n %{name}-%{version}alpha %build CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64" \ @@ -135,6 +135,9 @@ rm -rf %{buildroot} %{_mandir}/man1/*lz* %changelog +* Sun Oct 16 2011 Jindrich Novy 5.1.1alpha-1 +- update to 5.1.1alpha + * Mon Jun 20 2011 Jindrich Novy 5.0.3-2 - better to have upstream tarballs in different formats than XZ to allow bootstrapping (#714765) From f25b55a01e195e9258be1b5f7e231dc45350d9cc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 03:22:40 -0600 Subject: [PATCH 25/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- xz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xz.spec b/xz.spec index bb6f9e6..0d518a1 100644 --- a/xz.spec +++ b/xz.spec @@ -3,7 +3,7 @@ Summary: LZMA compression utilities Name: xz Version: 5.1.1 -Release: 1alpha%{?dist} +Release: 2alpha%{?dist} License: LGPLv2+ Group: Applications/File # official upstream release @@ -135,6 +135,9 @@ rm -rf %{buildroot} %{_mandir}/man1/*lz* %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 5.1.1-2alpha +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Sun Oct 16 2011 Jindrich Novy 5.1.1alpha-1 - update to 5.1.1alpha From 39fd73035c4eeffcb696d3d8d8ebfcdce874d69b Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Thu, 5 Jul 2012 16:29:29 +0200 Subject: [PATCH 26/67] update to 5.1.2alpha --- .gitignore | 2 +- sources | 2 +- xz.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 58e3cb6..1500eb5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /xz-4.999.9beta.20100401git.tar.bz2 -/xz-5.1.1alpha.tar.gz +/xz-5.1.2alpha.tar.gz diff --git a/sources b/sources index 4583df5..dda7a41 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 3aa7bbfaa2d5a87f65c23224b9016006 xz-4.999.9beta.20100401git.tar.bz2 -bb24436fa12780808e1c142980484104 xz-5.1.1alpha.tar.gz +9bad1e249537ce69b206815cf28ca87b xz-5.1.2alpha.tar.gz diff --git a/xz.spec b/xz.spec index 0d518a1..3e9a864 100644 --- a/xz.spec +++ b/xz.spec @@ -2,8 +2,8 @@ Summary: LZMA compression utilities Name: xz -Version: 5.1.1 -Release: 2alpha%{?dist} +Version: 5.1.2 +Release: 1alpha%{?dist} License: LGPLv2+ Group: Applications/File # official upstream release @@ -135,6 +135,9 @@ rm -rf %{buildroot} %{_mandir}/man1/*lz* %changelog +* Thu Jul 05 2012 Jindrich Novy 5.1.2alpha-1 +- update to 5.1.2alpha + * Sat Jan 14 2012 Fedora Release Engineering - 5.1.1-2alpha - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 5177d25b189c80fcf00588129de70d2f8c60c98e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 22 Jul 2012 02:29:11 -0500 Subject: [PATCH 27/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- xz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xz.spec b/xz.spec index 3e9a864..da26551 100644 --- a/xz.spec +++ b/xz.spec @@ -3,7 +3,7 @@ Summary: LZMA compression utilities Name: xz Version: 5.1.2 -Release: 1alpha%{?dist} +Release: 2alpha%{?dist} License: LGPLv2+ Group: Applications/File # official upstream release @@ -135,6 +135,9 @@ rm -rf %{buildroot} %{_mandir}/man1/*lz* %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 5.1.2-2alpha +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Thu Jul 05 2012 Jindrich Novy 5.1.2alpha-1 - update to 5.1.2alpha From 6d9e11228370a19c6d41fd84c0b478ea02ec15de Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 22:07:49 -0600 Subject: [PATCH 28/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- xz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xz.spec b/xz.spec index da26551..92b17fc 100644 --- a/xz.spec +++ b/xz.spec @@ -3,7 +3,7 @@ Summary: LZMA compression utilities Name: xz Version: 5.1.2 -Release: 2alpha%{?dist} +Release: 3alpha%{?dist} License: LGPLv2+ Group: Applications/File # official upstream release @@ -135,6 +135,9 @@ rm -rf %{buildroot} %{_mandir}/man1/*lz* %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 5.1.2-3alpha +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Jul 22 2012 Fedora Release Engineering - 5.1.2-2alpha - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 8ead55586736af2b3f808990fc3b1e81e5032bab Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Thu, 21 Feb 2013 01:23:50 +0100 Subject: [PATCH 29/67] add support for ppc64p7 arch (Power7 optimized) --- xz.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xz.spec b/xz.spec index 92b17fc..026755c 100644 --- a/xz.spec +++ b/xz.spec @@ -3,7 +3,7 @@ Summary: LZMA compression utilities Name: xz Version: 5.1.2 -Release: 3alpha%{?dist} +Release: 4alpha%{?dist} License: LGPLv2+ Group: Applications/File # official upstream release @@ -66,6 +66,9 @@ commands that deal with the older LZMA format. %prep %setup -q -a1 -n %{name}-%{version}alpha +for i in `find . -name config.sub`; do + perl -pi -e "s/ppc64-\*/ppc64-\* \| ppc64p7-\*/" $i +done %build CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64" \ @@ -135,6 +138,9 @@ rm -rf %{buildroot} %{_mandir}/man1/*lz* %changelog +* Thu Feb 21 2013 Karsten Hopp 5.1.2-4alpha +- add support for ppc64p7 arch (Power7 optimized) + * Fri Feb 15 2013 Fedora Release Engineering - 5.1.2-3alpha - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From e01a5abdb7386b393c0de33e00b704b3bf7abf7b Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Tue, 9 Apr 2013 12:47:28 +0200 Subject: [PATCH 30/67] docs: Sync man pages & --help output Version: xz-5.1.2-5alpha Resolves: #948533 --- xz-5.1.2alpha-man-page-day.patch | 81 ++++++++++++++++++++++++++++++++ xz.spec | 12 ++++- 2 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 xz-5.1.2alpha-man-page-day.patch diff --git a/xz-5.1.2alpha-man-page-day.patch b/xz-5.1.2alpha-man-page-day.patch new file mode 100644 index 0000000..1d15a59 --- /dev/null +++ b/xz-5.1.2alpha-man-page-day.patch @@ -0,0 +1,81 @@ +diff --git a/src/xz/message.c b/src/xz/message.c +index abbd171..ce953ac 100644 +--- a/src/xz/message.c ++++ b/src/xz/message.c +@@ -1110,7 +1110,8 @@ message_help(bool long_help) + + puts(_( + " -z, --compress force compression\n" +-" -d, --decompress force decompression\n" ++" -d, --decompress, --uncompress\n" ++" force decompression\n" + " -t, --test test compressed file integrity\n" + " -l, --list list information about .xz files")); + +@@ -1120,7 +1121,8 @@ message_help(bool long_help) + puts(_( + " -k, --keep keep (don't delete) input files\n" + " -f, --force force overwrite of output file and (de)compress links\n" +-" -c, --stdout write to standard output and don't delete input files")); ++" -c, --stdout, --to-stdout\n" ++" write to standard output and don't delete input files")); + + if (long_help) { + puts(_( +@@ -1152,6 +1154,10 @@ message_help(bool long_help) + " -e, --extreme try to improve compression ratio by using more CPU time;\n" + " does not affect decompressor memory requirements")); + ++ puts(_( ++" -T, --threads=NUM use at most NUM threads; the default is 1; set to 0\n" ++" to use the number of processor cores")); ++ + if (long_help) { + // FIXME? Mention something about threading? + puts(_( +@@ -1166,7 +1172,7 @@ message_help(bool long_help) + puts(_( // xgettext:no-c-format + " --memlimit-compress=LIMIT\n" + " --memlimit-decompress=LIMIT\n" +-" -M, --memlimit=LIMIT\n" ++" -M, --memlimit=LIMIT, (old alias --memory=LIMIT)\n" + " set memory usage limit for compression, decompression,\n" + " or both; LIMIT is in bytes, % of RAM, or 0 for defaults")); + +diff --git a/src/xz/xz.1 b/src/xz/xz.1 +index 0368f05..e5da140 100644 +--- a/src/xz/xz.1 ++++ b/src/xz/xz.1 +@@ -912,7 +912,7 @@ See + for possible ways to specify the + .IR limit . + .TP +-\fB\-M\fR \fIlimit\fR, \fB\-\-memlimit=\fIlimit\fR, \fB\-\-memory=\fIlimit ++\fB\-M\fR \fIlimit\fR, \fB\-\-memlimit=\fIlimit\fR, (old alias \fB\-\-memory=\fIlimit\fR) + This is equivalent to specifying \fB\-\-memlimit\-compress=\fIlimit + \fB\-\-memlimit\-decompress=\fIlimit\fR. + .TP +diff --git a/src/xzdec/xzdec.c b/src/xzdec/xzdec.c +index b7830db..48ac1fe 100644 +--- a/src/xzdec/xzdec.c ++++ b/src/xzdec/xzdec.c +@@ -64,13 +64,15 @@ help(void) + "Usage: %s [OPTION]... [FILE]...\n" + "Uncompress files in the ." TOOL_FORMAT " format to the standard output.\n" + "\n" +-" -c, --stdout (ignored)\n" +-" -d, --decompress (ignored)\n" +-" -k, --keep (ignored)\n" + " -q, --quiet specify *twice* to suppress errors\n" +-" -Q, --no-warn (ignored)\n" + " -h, --help display this help and exit\n" + " -V, --version display the version number and exit\n" ++" -c, --stdout, --to-stdout\n" ++" ignored, data are always written to standard output\n" ++" -d, --decompress, --uncompress\n" ++" ignored, only decompression is supported\n" ++" -k, --keep ignored, we never create/remove any files\n" ++" -Q, --no-warn ignored, we never use exit status 2\n" + "\n" + "With no FILE, or when FILE is -, read standard input.\n" + "\n" diff --git a/xz.spec b/xz.spec index 026755c..ea6a8da 100644 --- a/xz.spec +++ b/xz.spec @@ -3,7 +3,7 @@ Summary: LZMA compression utilities Name: xz Version: 5.1.2 -Release: 4alpha%{?dist} +Release: 5alpha%{?dist} License: LGPLv2+ Group: Applications/File # official upstream release @@ -14,6 +14,11 @@ URL: http://tukaani.org/%{name}/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-libs = %{version}-%{release} +# partly upstream/partly not (yet?) +# ~> proposal: http://www.mail-archive.com/xz-devel@tukaani.org/msg00153.html +# ~> #948533 +Patch0: xz-5.1.2alpha-man-page-day.patch + %description XZ Utils are an attempt to make LZMA compression easy to use on free (as in freedom) operating systems. This is achieved by providing tools and libraries @@ -66,6 +71,8 @@ commands that deal with the older LZMA format. %prep %setup -q -a1 -n %{name}-%{version}alpha +%patch0 -p1 -b .man-page-day + for i in `find . -name config.sub`; do perl -pi -e "s/ppc64-\*/ppc64-\* \| ppc64p7-\*/" $i done @@ -138,6 +145,9 @@ rm -rf %{buildroot} %{_mandir}/man1/*lz* %changelog +* Tue Apr 09 2013 Pavel Raiskup - 5.1.2-5alpha +- fix manual page inconsistencies with help output (private #948533) + * Thu Feb 21 2013 Karsten Hopp 5.1.2-4alpha - add support for ppc64p7 arch (Power7 optimized) From 93ff517f90c9044d61d35aee486e3861d698bc55 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Tue, 9 Apr 2013 13:01:06 +0200 Subject: [PATCH 31/67] xzgrep: fix non-working -h option Version: xz-5.1.2-5alpha Resolves: #850898 --- xz-5.1.2alpha-xzgrep-and-h-option.patch | 23 +++++++++++++++++++++++ xz.spec | 7 +++++++ 2 files changed, 30 insertions(+) create mode 100644 xz-5.1.2alpha-xzgrep-and-h-option.patch diff --git a/xz-5.1.2alpha-xzgrep-and-h-option.patch b/xz-5.1.2alpha-xzgrep-and-h-option.patch new file mode 100644 index 0000000..dfbdf35 --- /dev/null +++ b/xz-5.1.2alpha-xzgrep-and-h-option.patch @@ -0,0 +1,23 @@ +commit 5019413a055ce29e660dbbf15e02443cb5a26c59 +Author: Jeff Bastian +AuthorDate: Wed Apr 3 13:59:17 2013 +0200 +Commit: Lasse Collin +CommitDate: Fri Apr 5 19:14:50 2013 +0300 + + xzgrep: make the '-h' option to be --no-filename equivalent + + * src/scripts/xzgrep.in: Accept the '-h' option in argument parsing. + +diff --git a/src/scripts/xzgrep.in b/src/scripts/xzgrep.in +index d8e9bb5..951266b 100644 +--- a/src/scripts/xzgrep.in ++++ b/src/scripts/xzgrep.in +@@ -109,7 +109,7 @@ while test $# -ne 0; do + files_with_matches=1;; + (-L | --files-witho*) + files_without_matches=1;; +- (--no-f*) ++ (-h | --no-f*) + no_filename=1;; + (-V | --v | --ve | --ver | --vers | --versi | --versio | --version) + echo "$version" || exit 2 diff --git a/xz.spec b/xz.spec index ea6a8da..fd40240 100644 --- a/xz.spec +++ b/xz.spec @@ -19,6 +19,11 @@ Requires: %{name}-libs = %{version}-%{release} # ~> #948533 Patch0: xz-5.1.2alpha-man-page-day.patch +# fix 'xzgrep -h' to behave as expected +# ~> upstream (5019413a0) +# ~> #948533 +Patch1: xz-5.1.2alpha-xzgrep-and-h-option.patch + %description XZ Utils are an attempt to make LZMA compression easy to use on free (as in freedom) operating systems. This is achieved by providing tools and libraries @@ -72,6 +77,7 @@ commands that deal with the older LZMA format. %prep %setup -q -a1 -n %{name}-%{version}alpha %patch0 -p1 -b .man-page-day +%patch1 -p1 -b .xzgrep-and-h-option for i in `find . -name config.sub`; do perl -pi -e "s/ppc64-\*/ppc64-\* \| ppc64p7-\*/" $i @@ -147,6 +153,7 @@ rm -rf %{buildroot} %changelog * Tue Apr 09 2013 Pavel Raiskup - 5.1.2-5alpha - fix manual page inconsistencies with help output (private #948533) +- enable/fix the 'xzgrep -h' (#850898) * Thu Feb 21 2013 Karsten Hopp 5.1.2-4alpha - add support for ppc64p7 arch (Power7 optimized) From f209416124cf12a116efb917d8e792120db09e12 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Tue, 9 Apr 2013 13:06:15 +0200 Subject: [PATCH 32/67] spec: fix typos Version: xz-5.1.2-5alpha --- xz.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xz.spec b/xz.spec index fd40240..2b098aa 100644 --- a/xz.spec +++ b/xz.spec @@ -21,7 +21,7 @@ Patch0: xz-5.1.2alpha-man-page-day.patch # fix 'xzgrep -h' to behave as expected # ~> upstream (5019413a0) -# ~> #948533 +# ~> #850898 Patch1: xz-5.1.2alpha-xzgrep-and-h-option.patch %description @@ -153,7 +153,7 @@ rm -rf %{buildroot} %changelog * Tue Apr 09 2013 Pavel Raiskup - 5.1.2-5alpha - fix manual page inconsistencies with help output (private #948533) -- enable/fix the 'xzgrep -h' (#850898) +- enable/fix the 'xzgrep -h' (private #850898) * Thu Feb 21 2013 Karsten Hopp 5.1.2-4alpha - add support for ppc64p7 arch (Power7 optimized) From 70817f06185c44749661cca26ed6242269509c96 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 04:24:41 -0500 Subject: [PATCH 33/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- xz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xz.spec b/xz.spec index 2b098aa..9a8c844 100644 --- a/xz.spec +++ b/xz.spec @@ -3,7 +3,7 @@ Summary: LZMA compression utilities Name: xz Version: 5.1.2 -Release: 5alpha%{?dist} +Release: 6alpha%{?dist} License: LGPLv2+ Group: Applications/File # official upstream release @@ -151,6 +151,9 @@ rm -rf %{buildroot} %{_mandir}/man1/*lz* %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 5.1.2-6alpha +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Tue Apr 09 2013 Pavel Raiskup - 5.1.2-5alpha - fix manual page inconsistencies with help output (private #948533) - enable/fix the 'xzgrep -h' (private #850898) From e7de512134ca93aff036ba845449561e237c7597 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Fri, 10 Jan 2014 14:41:08 +0100 Subject: [PATCH 34/67] spec: build with -O3 on ppc64 Resolves: #1051078 Version: 5.1.2-7alpha --- xz.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/xz.spec b/xz.spec index 9a8c844..bf2ac6e 100644 --- a/xz.spec +++ b/xz.spec @@ -3,7 +3,7 @@ Summary: LZMA compression utilities Name: xz Version: 5.1.2 -Release: 6alpha%{?dist} +Release: 7alpha%{?dist} License: LGPLv2+ Group: Applications/File # official upstream release @@ -84,8 +84,12 @@ for i in `find . -name config.sub`; do done %build -CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64" \ -CXXFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64" \ +CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64" +%ifarch %{power64} + CFLAGS=`echo $CFLAGS | xargs -n 1 | sed 's|^-O2$|-O3|g' | xargs -n 100` +%endif +export CFLAGS + %configure --disable-static sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool @@ -151,6 +155,9 @@ rm -rf %{buildroot} %{_mandir}/man1/*lz* %changelog +* Fri Jan 10 2014 Pavel Raiskup - 5.1.2-7alpha +- build with -O3 on ppc64 (private #1051078) + * Sun Aug 04 2013 Fedora Release Engineering - 5.1.2-6alpha - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 21e8be418c8c708b81de3b1ede2e97b3bad20562 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Wed, 2 Apr 2014 09:35:33 +0200 Subject: [PATCH 35/67] spec: add _isa requirements where appropriate Version: 5.1.2-8alpha --- xz.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xz.spec b/xz.spec index bf2ac6e..9ec7c63 100644 --- a/xz.spec +++ b/xz.spec @@ -3,7 +3,7 @@ Summary: LZMA compression utilities Name: xz Version: 5.1.2 -Release: 7alpha%{?dist} +Release: 8alpha%{?dist} License: LGPLv2+ Group: Applications/File # official upstream release @@ -12,7 +12,7 @@ Source0: http://tukaani.org/%{name}/%{name}-%{version}alpha.tar.gz Source1: %{compat_ver}.20100401git.tar.bz2 URL: http://tukaani.org/%{name}/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} # partly upstream/partly not (yet?) # ~> proposal: http://www.mail-archive.com/xz-devel@tukaani.org/msg00153.html @@ -55,7 +55,7 @@ This particular package ships libraries from %{compat_ver} as of 1st of April 20 Summary: Devel libraries & headers for liblzma Group: Development/Libraries License: LGPLv2+ -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: pkgconfig %description devel @@ -155,6 +155,9 @@ rm -rf %{buildroot} %{_mandir}/man1/*lz* %changelog +* Wed Apr 02 2014 Pavel Raiskup - 5.1.2-8alpha +- add _isa requirements where appropriate + * Fri Jan 10 2014 Pavel Raiskup - 5.1.2-7alpha - build with -O3 on ppc64 (private #1051078) From c7e91236f6bc5be45e1fc13f51b99e0ac08813f4 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Wed, 2 Apr 2014 10:20:22 +0200 Subject: [PATCH 36/67] xzless: better check the less version Resolves: #1015924 Version: 5.1.2-8alpha --- xz-5.1.2alpha-less-version-check.patch | 13 +++++++++++++ xz.spec | 7 +++++++ 2 files changed, 20 insertions(+) create mode 100644 xz-5.1.2alpha-less-version-check.patch diff --git a/xz-5.1.2alpha-less-version-check.patch b/xz-5.1.2alpha-less-version-check.patch new file mode 100644 index 0000000..2381ddb --- /dev/null +++ b/xz-5.1.2alpha-less-version-check.patch @@ -0,0 +1,13 @@ +diff --git a/src/scripts/xzless.in b/src/scripts/xzless.in +index a3da697..288dd87 100644 +--- a/src/scripts/xzless.in ++++ b/src/scripts/xzless.in +@@ -46,7 +46,7 @@ if test "${LESSMETACHARS+set}" != set; then + LESSMETACHARS="$space$tab$nl'"';*?"()<>[|&^`#\$%=~' + fi + +-if test "$(less -V | { read ver && echo ${ver#less }; })" -ge 429; then ++if test "$(less -V | { read less ver re && echo ${ver}; })" -ge 429; then + # less 429 or later: LESSOPEN pipe will be used on + # standard input if $LESSOPEN begins with |-. + LESSOPEN="|-$xz -cdfq -- %s" diff --git a/xz.spec b/xz.spec index 9ec7c63..41912e7 100644 --- a/xz.spec +++ b/xz.spec @@ -24,6 +24,11 @@ Patch0: xz-5.1.2alpha-man-page-day.patch # ~> #850898 Patch1: xz-5.1.2alpha-xzgrep-and-h-option.patch +# fix less version checking +# ~> upstream (db5c1817fa, 9e6dabcf22) +# ~> #1015924 +Patch2: xz-5.1.2alpha-less-version-check.patch + %description XZ Utils are an attempt to make LZMA compression easy to use on free (as in freedom) operating systems. This is achieved by providing tools and libraries @@ -78,6 +83,7 @@ commands that deal with the older LZMA format. %setup -q -a1 -n %{name}-%{version}alpha %patch0 -p1 -b .man-page-day %patch1 -p1 -b .xzgrep-and-h-option +%patch2 -p1 -b .less-version-check for i in `find . -name config.sub`; do perl -pi -e "s/ppc64-\*/ppc64-\* \| ppc64p7-\*/" $i @@ -157,6 +163,7 @@ rm -rf %{buildroot} %changelog * Wed Apr 02 2014 Pavel Raiskup - 5.1.2-8alpha - add _isa requirements where appropriate +- better check the version of less binary (#1015924) * Fri Jan 10 2014 Pavel Raiskup - 5.1.2-7alpha - build with -O3 on ppc64 (private #1051078) From 083f3ed28e2495a94697088d200df7d9a386211c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 16 May 2014 15:06:22 +0100 Subject: [PATCH 37/67] Add a -static subpackage (see RHBZ#547011). --- xz.spec | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/xz.spec b/xz.spec index 41912e7..61fc123 100644 --- a/xz.spec +++ b/xz.spec @@ -3,7 +3,7 @@ Summary: LZMA compression utilities Name: xz Version: 5.1.2 -Release: 8alpha%{?dist} +Release: 9alpha%{?dist} License: LGPLv2+ Group: Applications/File # official upstream release @@ -47,6 +47,15 @@ License: LGPLv2+ %description libs Libraries for decoding files compressed with LZMA or XZ utils. +%package static +Summary: Statically linked library for decoding LZMA compression +Group: System Environment/Libraries +License: LGPLv2+ + +%description static +Statically linked library for decoding files compressed with LZMA or +XZ utils. Most users should *not* install this. + %package compat-libs Summary: Compatibility libraries for decoding LZMA compression Group: System Environment/Libraries @@ -96,13 +105,13 @@ CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64" %endif export CFLAGS -%configure --disable-static +%configure sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} pushd %{compat_ver} -%configure --disable-static +%configure sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} @@ -111,7 +120,6 @@ popd %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" -rm -f %{buildroot}%{_libdir}/*.a rm -f %{buildroot}%{_libdir}/*.la rm -rf %{buildroot}%{_docdir}/%{name} rm -rf %{buildroot}%{_datadir}/locale @@ -142,6 +150,11 @@ rm -rf %{buildroot} %doc COPYING* %{_libdir}/lib*.so.5* +%files static +%defattr(-,root,root,-) +%doc COPYING* +%{_libdir}/liblzma.a + %files compat-libs %defattr(-,root,root,-) %doc COPYING* @@ -161,6 +174,9 @@ rm -rf %{buildroot} %{_mandir}/man1/*lz* %changelog +* Fri May 16 2014 Richard W.M. Jones - 5.1.2-9alpha +- Add a -static subpackage (see RHBZ#547011). + * Wed Apr 02 2014 Pavel Raiskup - 5.1.2-8alpha - add _isa requirements where appropriate - better check the version of less binary (#1015924) From ff60bb375ffae1060c67329ddeeb2e8962adee36 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 31 May 2014 23:01:06 +0100 Subject: [PATCH 38/67] Drop ChangeLog, it's big and the excitement is summarised in NEWS --- xz.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xz.spec b/xz.spec index 61fc123..d79bcf5 100644 --- a/xz.spec +++ b/xz.spec @@ -3,7 +3,7 @@ Summary: LZMA compression utilities Name: xz Version: 5.1.2 -Release: 9alpha%{?dist} +Release: 10alpha%{?dist} License: LGPLv2+ Group: Applications/File # official upstream release @@ -141,7 +141,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc AUTHORS COPYING* ChangeLog NEWS README THANKS TODO +%doc AUTHORS COPYING* NEWS README THANKS TODO %{_bindir}/*xz* %{_mandir}/man1/*xz* @@ -174,6 +174,9 @@ rm -rf %{buildroot} %{_mandir}/man1/*lz* %changelog +* Sat May 31 2014 Peter Robinson 5.1.2-10alpha +- Drop ChangeLog, it's big and the excitement is summarised in NEWS + * Fri May 16 2014 Richard W.M. Jones - 5.1.2-9alpha - Add a -static subpackage (see RHBZ#547011). From 19677d21835aab998e61b7b2bc8784e77ef5e698 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 02:02:22 -0500 Subject: [PATCH 39/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- xz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xz.spec b/xz.spec index d79bcf5..9010a22 100644 --- a/xz.spec +++ b/xz.spec @@ -3,7 +3,7 @@ Summary: LZMA compression utilities Name: xz Version: 5.1.2 -Release: 10alpha%{?dist} +Release: 11alpha%{?dist} License: LGPLv2+ Group: Applications/File # official upstream release @@ -174,6 +174,9 @@ rm -rf %{buildroot} %{_mandir}/man1/*lz* %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 5.1.2-11alpha +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat May 31 2014 Peter Robinson 5.1.2-10alpha - Drop ChangeLog, it's big and the excitement is summarised in NEWS From d23e30817f295d66099a4d2a30a9052a247dfeba Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Fri, 13 Jun 2014 11:58:34 +0200 Subject: [PATCH 40/67] xzgrep: return 0 when at least one file matches Resolves: #1109122 Version: 5.1.2-12alpha --- xz-5.1.2alpha-xzgrep-exit-test.patch | 60 ++++++++++++++++++++++++++++ xz-5.1.2alpha-xzgrep-exit.patch | 50 +++++++++++++++++++++++ xz.spec | 14 ++++++- 3 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 xz-5.1.2alpha-xzgrep-exit-test.patch create mode 100644 xz-5.1.2alpha-xzgrep-exit.patch diff --git a/xz-5.1.2alpha-xzgrep-exit-test.patch b/xz-5.1.2alpha-xzgrep-exit-test.patch new file mode 100644 index 0000000..352aa2d --- /dev/null +++ b/xz-5.1.2alpha-xzgrep-exit-test.patch @@ -0,0 +1,60 @@ +commit 1e60f2c0a0ee6c18b02943ce56214799a70aac26 (HEAD, origin/master, origin/HEAD, master) +Author: Lasse Collin +AuthorDate: Wed Jun 11 21:03:25 2014 +0300 +Commit: Lasse Collin +CommitDate: Wed Jun 11 21:03:25 2014 +0300 + + xzgrep: Add a test for the previous fix. + + This is a simplified version of Pavel Raiskup's + original patch. + +diff --git a/tests/test_scripts.sh b/tests/test_scripts.sh +index 293929e..7ac1fea 100755 +--- a/tests/test_scripts.sh ++++ b/tests/test_scripts.sh +@@ -12,16 +12,18 @@ + # If scripts weren't built, this test is skipped. + XZ=../src/xz/xz + XZDIFF=../src/scripts/xzdiff +-test -x "$XZ" || XZ= +-test -x "$XZDIFF" || XZDIFF= +-if test -z "$XZ" || test -z "$XZDIFF"; then ++XZGREP=../src/scripts/xzgrep ++ ++for i in XZ XZDIFF XZGREP; do ++ eval test -x "\$$i" && continue + (exit 77) + exit 77 +-fi ++done + + PATH=`pwd`/../src/xz:$PATH + export PATH + ++test -z "$srcdir" && srcdir=. + preimage=$srcdir/files/good-1-check-crc32.xz + samepostimage=$srcdir/files/good-1-check-crc64.xz + otherpostimage=$srcdir/files/good-1-lzma2-1.xz +@@ -50,5 +52,21 @@ if test "$status" != 2 ; then + exit 1 + fi + ++# The exit status must be 0 when a match was found at least from one file, ++# and 1 when no match was found in any file. ++for pattern in el Hello NOMATCH; do ++ for opts in "" "-l" "-h" "-H"; do ++ "$XZGREP" $opts $pattern \ ++ "$srcdir/files/good-1-lzma2-1.xz" \ ++ "$srcdir/files/good-2-lzma2.xz" > /dev/null 2>&1 ++ status=$? ++ test $status = 0 && test $pattern != NOMATCH && continue ++ test $status = 1 && test $pattern = NOMATCH && continue ++ echo "wrong exit status from xzgrep" ++ (exit 1) ++ exit 1 ++ done ++done ++ + (exit 0) + exit 0 diff --git a/xz-5.1.2alpha-xzgrep-exit.patch b/xz-5.1.2alpha-xzgrep-exit.patch new file mode 100644 index 0000000..a64b464 --- /dev/null +++ b/xz-5.1.2alpha-xzgrep-exit.patch @@ -0,0 +1,50 @@ +commit ceca37901783988204caaf40dff4623d535cc789 +Author: Lasse Collin +AuthorDate: Wed Jun 11 20:43:28 2014 +0300 +Commit: Lasse Collin +CommitDate: Wed Jun 11 20:43:28 2014 +0300 + + xzgrep: exit 0 when at least one file matches. + + Mimic the original grep behavior and return exit_success when + at least one xz compressed file matches given pattern. + + Original bugreport: + https://bugzilla.redhat.com/show_bug.cgi?id=1108085 + + Thanks to Pavel Raiskup for the patch. + +diff --git a/src/scripts/xzgrep.in b/src/scripts/xzgrep.in +index 951266b..018915f 100644 +--- a/src/scripts/xzgrep.in ++++ b/src/scripts/xzgrep.in +@@ -147,7 +147,9 @@ if test $# -eq 0; then + fi + + exec 3>&1 +-res=0 ++ ++# res=1 means that no file matched yet ++res=1 + + for i; do + case $i in +@@ -195,8 +197,17 @@ for i; do + fi >&3 5>&- + ) + r=$? ++ ++ # fail occured previously, nothing worse can happen ++ test $res -gt 1 && continue ++ + test "$xz_status" -eq 0 || test "$xz_status" -eq 2 \ + || test "$(kill -l "$xz_status" 2> /dev/null)" = "PIPE" || r=2 +- test $res -lt $r && res=$r ++ ++ # still no match ++ test $r -eq 1 && continue ++ ++ # 0 == match, >=2 == fail ++ res=$r + done + exit $res diff --git a/xz.spec b/xz.spec index 9010a22..8868d01 100644 --- a/xz.spec +++ b/xz.spec @@ -3,7 +3,7 @@ Summary: LZMA compression utilities Name: xz Version: 5.1.2 -Release: 11alpha%{?dist} +Release: 12alpha%{?dist} License: LGPLv2+ Group: Applications/File # official upstream release @@ -29,6 +29,13 @@ Patch1: xz-5.1.2alpha-xzgrep-and-h-option.patch # ~> #1015924 Patch2: xz-5.1.2alpha-less-version-check.patch +# xzgrep: return 0 when at least one file matches (+ test) +# ~> upstream (ceca37901783) +# ~> #1109122 +Patch3: xz-5.1.2alpha-xzgrep-exit.patch +Patch4: xz-5.1.2alpha-xzgrep-exit-test.patch + + %description XZ Utils are an attempt to make LZMA compression easy to use on free (as in freedom) operating systems. This is achieved by providing tools and libraries @@ -93,6 +100,8 @@ commands that deal with the older LZMA format. %patch0 -p1 -b .man-page-day %patch1 -p1 -b .xzgrep-and-h-option %patch2 -p1 -b .less-version-check +%patch3 -p1 -b .xzgrep-exit-status +%patch4 -p1 -b .xzgrep-exit-status-test for i in `find . -name config.sub`; do perl -pi -e "s/ppc64-\*/ppc64-\* \| ppc64p7-\*/" $i @@ -174,6 +183,9 @@ rm -rf %{buildroot} %{_mandir}/man1/*lz* %changelog +* Fri Jun 13 2014 Pavel Raiskup - 5.1.2-12alpha +- xzgrep: return 0 when at least one file matches (#1109122) + * Sun Jun 08 2014 Fedora Release Engineering - 5.1.2-11alpha - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From b40d96962bb94d647c6cb06e7f182bb1deef63da Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 6 Aug 2014 13:50:47 +0200 Subject: [PATCH 41/67] fix license handling --- xz.spec | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/xz.spec b/xz.spec index 8868d01..2c8eff8 100644 --- a/xz.spec +++ b/xz.spec @@ -3,7 +3,7 @@ Summary: LZMA compression utilities Name: xz Version: 5.1.2 -Release: 12alpha%{?dist} +Release: 13alpha%{?dist} License: LGPLv2+ Group: Applications/File # official upstream release @@ -150,24 +150,29 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc AUTHORS COPYING* NEWS README THANKS TODO +%{!?_licensedir:%global license %%doc} +%license COPYING* +%doc AUTHORS NEWS README THANKS TODO %{_bindir}/*xz* %{_mandir}/man1/*xz* %files libs %defattr(-,root,root,-) -%doc COPYING* +%{!?_licensedir:%global license %%doc} +%license COPYING %{_libdir}/lib*.so.5* %files static %defattr(-,root,root,-) -%doc COPYING* +%{!?_licensedir:%global license %%doc} +%license COPYING %{_libdir}/liblzma.a %files compat-libs %defattr(-,root,root,-) -%doc COPYING* -%{_libdir}/lib*.so.0* +%{!?_licensedir:%global license %%doc} +%license COPYING* +%doc COPYING* %{_libdir}/lib*.so.0* %files devel %defattr(-,root,root,-) @@ -183,6 +188,9 @@ rm -rf %{buildroot} %{_mandir}/man1/*lz* %changelog +* Wed Aug 6 2014 Tom Callaway - 5.1.2-13alpha +- fix license handling + * Fri Jun 13 2014 Pavel Raiskup - 5.1.2-12alpha - xzgrep: return 0 when at least one file matches (#1109122) From ebf8a9c9567b6b7130c256d4499aa4f078c5fead Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 6 Aug 2014 14:18:53 +0200 Subject: [PATCH 42/67] fix license handling --- xz.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xz.spec b/xz.spec index 2c8eff8..882a75f 100644 --- a/xz.spec +++ b/xz.spec @@ -159,20 +159,20 @@ rm -rf %{buildroot} %files libs %defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} -%license COPYING +%license COPYING* %{_libdir}/lib*.so.5* %files static %defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} -%license COPYING +%license COPYING* %{_libdir}/liblzma.a %files compat-libs %defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} %license COPYING* -%doc COPYING* %{_libdir}/lib*.so.0* +%{_libdir}/lib*.so.0* %files devel %defattr(-,root,root,-) From 4f5a18f7919dbfe454ca8c3bfd3c86e4c8c220d4 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 11:13:05 +0000 Subject: [PATCH 43/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- xz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xz.spec b/xz.spec index 882a75f..b2878d0 100644 --- a/xz.spec +++ b/xz.spec @@ -3,7 +3,7 @@ Summary: LZMA compression utilities Name: xz Version: 5.1.2 -Release: 13alpha%{?dist} +Release: 14alpha%{?dist} License: LGPLv2+ Group: Applications/File # official upstream release @@ -188,6 +188,9 @@ rm -rf %{buildroot} %{_mandir}/man1/*lz* %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 5.1.2-14alpha +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Wed Aug 6 2014 Tom Callaway - 5.1.2-13alpha - fix license handling From 9907793ad89ae939e458a7f323aa9b12f87429e3 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Tue, 26 Aug 2014 10:12:07 +0200 Subject: [PATCH 44/67] profile.d: colorize interactive x*zgrep output .. when grep output is colored also. This commit can be done thanks to the fix from rhbz#1034631. Version: 5.1.2-15alpha Resolves: #1034846 --- colorxzgrep.csh | 5 +++++ colorxzgrep.sh | 4 ++++ xz.spec | 15 ++++++++++++++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 colorxzgrep.csh create mode 100644 colorxzgrep.sh diff --git a/colorxzgrep.csh b/colorxzgrep.csh new file mode 100644 index 0000000..a3964dc --- /dev/null +++ b/colorxzgrep.csh @@ -0,0 +1,5 @@ +/usr/libexec/grepconf.sh -c +if ( $status == 1 ) exit +alias xzgrep 'xzgrep --color=auto' +alias xzfgrep 'xzfgrep --color=auto' +alias xzegrep 'xzegrep --color=auto' diff --git a/colorxzgrep.sh b/colorxzgrep.sh new file mode 100644 index 0000000..4a91d70 --- /dev/null +++ b/colorxzgrep.sh @@ -0,0 +1,4 @@ +/usr/libexec/grepconf.sh -c || return +alias xzgrep='xzgrep --color=auto' 2>/dev/null +alias xzegrep='xzegrep --color=auto' 2>/dev/null +alias xzfgrep='xzfgrep --color=auto' 2>/dev/null diff --git a/xz.spec b/xz.spec index b2878d0..0d2f7cf 100644 --- a/xz.spec +++ b/xz.spec @@ -3,13 +3,17 @@ Summary: LZMA compression utilities Name: xz Version: 5.1.2 -Release: 14alpha%{?dist} +Release: 15alpha%{?dist} License: LGPLv2+ Group: Applications/File # official upstream release Source0: http://tukaani.org/%{name}/%{name}-%{version}alpha.tar.gz # source created as "make dist" in checked out GIT tree Source1: %{compat_ver}.20100401git.tar.bz2 + +Source100: colorxzgrep.sh +Source101: colorxzgrep.csh + URL: http://tukaani.org/%{name}/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -134,6 +138,11 @@ rm -rf %{buildroot}%{_docdir}/%{name} rm -rf %{buildroot}%{_datadir}/locale cp -r %{compat_ver}/src/liblzma/.libs/liblzma.so.0* %{buildroot}%{_libdir} +%global profiledir %{_sysconfdir}/profile.d +mkdir -p %{buildroot}%{profiledir} +install -p -m 644 %{SOURCE100} %{buildroot}%{profiledir} +install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} + %check LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check @@ -155,6 +164,7 @@ rm -rf %{buildroot} %doc AUTHORS NEWS README THANKS TODO %{_bindir}/*xz* %{_mandir}/man1/*xz* +%{profiledir}/* %files libs %defattr(-,root,root,-) @@ -188,6 +198,9 @@ rm -rf %{buildroot} %{_mandir}/man1/*lz* %changelog +* Tue Aug 26 2014 Pavel Raiskup - 5.1.2-15alpha +- xz*grep's output is colored iff grep's is (#1034846) + * Mon Aug 18 2014 Fedora Release Engineering - 5.1.2-14alpha - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 729c7139dddfc5e0e43307b06568e566ebfcea4d Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Tue, 23 Dec 2014 18:11:26 +0100 Subject: [PATCH 45/67] rebase to new stable version All patches were removed because those were applied upstream (with one exception - the man-page-day fix - which was upstram-rejected; so not needed anyway). Resolves: #1023718 Version: 5.2.0-1 --- .gitignore | 2 +- sources | 2 +- xz.spec | 38 ++++++++------------------------------ 3 files changed, 10 insertions(+), 32 deletions(-) diff --git a/.gitignore b/.gitignore index 1500eb5..18d21b8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /xz-4.999.9beta.20100401git.tar.bz2 -/xz-5.1.2alpha.tar.gz +/xz-5.2.0.tar.xz diff --git a/sources b/sources index dda7a41..3a6aaca 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 3aa7bbfaa2d5a87f65c23224b9016006 xz-4.999.9beta.20100401git.tar.bz2 -9bad1e249537ce69b206815cf28ca87b xz-5.1.2alpha.tar.gz +d87c242778fcf5ce4598de80a55ded28 xz-5.2.0.tar.xz diff --git a/xz.spec b/xz.spec index 0d2f7cf..fe53a07 100644 --- a/xz.spec +++ b/xz.spec @@ -2,12 +2,12 @@ Summary: LZMA compression utilities Name: xz -Version: 5.1.2 -Release: 15alpha%{?dist} +Version: 5.2.0 +Release: 1%{?dist} License: LGPLv2+ Group: Applications/File # official upstream release -Source0: http://tukaani.org/%{name}/%{name}-%{version}alpha.tar.gz +Source0: http://tukaani.org/%{name}/%{name}-%{version}.tar.xz # source created as "make dist" in checked out GIT tree Source1: %{compat_ver}.20100401git.tar.bz2 @@ -18,27 +18,6 @@ URL: http://tukaani.org/%{name}/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-libs%{?_isa} = %{version}-%{release} -# partly upstream/partly not (yet?) -# ~> proposal: http://www.mail-archive.com/xz-devel@tukaani.org/msg00153.html -# ~> #948533 -Patch0: xz-5.1.2alpha-man-page-day.patch - -# fix 'xzgrep -h' to behave as expected -# ~> upstream (5019413a0) -# ~> #850898 -Patch1: xz-5.1.2alpha-xzgrep-and-h-option.patch - -# fix less version checking -# ~> upstream (db5c1817fa, 9e6dabcf22) -# ~> #1015924 -Patch2: xz-5.1.2alpha-less-version-check.patch - -# xzgrep: return 0 when at least one file matches (+ test) -# ~> upstream (ceca37901783) -# ~> #1109122 -Patch3: xz-5.1.2alpha-xzgrep-exit.patch -Patch4: xz-5.1.2alpha-xzgrep-exit-test.patch - %description XZ Utils are an attempt to make LZMA compression easy to use on free (as in @@ -100,12 +79,7 @@ The lzma-compat package contains compatibility links for older commands that deal with the older LZMA format. %prep -%setup -q -a1 -n %{name}-%{version}alpha -%patch0 -p1 -b .man-page-day -%patch1 -p1 -b .xzgrep-and-h-option -%patch2 -p1 -b .less-version-check -%patch3 -p1 -b .xzgrep-exit-status -%patch4 -p1 -b .xzgrep-exit-status-test +%setup -q -a1 for i in `find . -name config.sub`; do perl -pi -e "s/ppc64-\*/ppc64-\* \| ppc64p7-\*/" $i @@ -198,6 +172,10 @@ rm -rf %{buildroot} %{_mandir}/man1/*lz* %changelog +* Tue Dec 23 2014 Pavel Raiskup - 5.2.0-1 +- rebase per upstream release notes (#1023718) + http://www.mail-archive.com/xz-devel@tukaani.org/msg00216.html + * Tue Aug 26 2014 Pavel Raiskup - 5.1.2-15alpha - xz*grep's output is colored iff grep's is (#1034846) From e75244ba15f49eb304f07bb3c17c5de70371a263 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 5 Jan 2015 08:44:28 +0100 Subject: [PATCH 46/67] spec: cleanup (fedora-review fixes) Remove redundant %defattr, install translation, don't define BuildRoot, etc. Version: 5.2.0-1 --- xz.spec | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/xz.spec b/xz.spec index fe53a07..6202ebf 100644 --- a/xz.spec +++ b/xz.spec @@ -15,7 +15,6 @@ Source100: colorxzgrep.sh Source101: colorxzgrep.csh URL: http://tukaani.org/%{name}/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -70,7 +69,7 @@ Summary: Older LZMA format compatibility binaries Group: Development/Libraries # lz{grep,diff,more} are GPLv2+. Other binaries are LGPLv2+ License: GPLv2+ and LGPLv2+ -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Obsoletes: lzma < %{version} Provides: lzma = %{version} @@ -105,24 +104,22 @@ make %{?_smp_mflags} popd %install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" +make install DESTDIR=%{buildroot} rm -f %{buildroot}%{_libdir}/*.la -rm -rf %{buildroot}%{_docdir}/%{name} -rm -rf %{buildroot}%{_datadir}/locale + cp -r %{compat_ver}/src/liblzma/.libs/liblzma.so.0* %{buildroot}%{_libdir} +# xzgrep colorization %global profiledir %{_sysconfdir}/profile.d mkdir -p %{buildroot}%{profiledir} install -p -m 644 %{SOURCE100} %{buildroot}%{profiledir} install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} +%find_lang %name + %check LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check -%clean -rm -rf %{buildroot} - %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig @@ -131,35 +128,30 @@ rm -rf %{buildroot} %postun compat-libs -p /sbin/ldconfig -%files -%defattr(-,root,root,-) +%files -f %{name}.lang %{!?_licensedir:%global license %%doc} %license COPYING* -%doc AUTHORS NEWS README THANKS TODO +%doc %{_docdir} %{_bindir}/*xz* %{_mandir}/man1/*xz* %{profiledir}/* %files libs -%defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} %license COPYING* %{_libdir}/lib*.so.5* %files static -%defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} %license COPYING* %{_libdir}/liblzma.a %files compat-libs -%defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} %license COPYING* %{_libdir}/lib*.so.0* %files devel -%defattr(-,root,root,-) %dir %{_includedir}/lzma %{_includedir}/lzma/*.h %{_includedir}/lzma.h @@ -167,7 +159,6 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/liblzma.pc %files lzma-compat -%defattr(-,root,root,-) %{_bindir}/*lz* %{_mandir}/man1/*lz* @@ -175,6 +166,7 @@ rm -rf %{buildroot} * Tue Dec 23 2014 Pavel Raiskup - 5.2.0-1 - rebase per upstream release notes (#1023718) http://www.mail-archive.com/xz-devel@tukaani.org/msg00216.html +- fedora-review fixes * Tue Aug 26 2014 Pavel Raiskup - 5.1.2-15alpha - xz*grep's output is colored iff grep's is (#1034846) From af917b1260fd84d0f943281f44c69b56f25d97ba Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Tue, 6 Jan 2015 12:27:13 +0100 Subject: [PATCH 47/67] spec: documentation and license fixes Don't install all COPYING* files because the vast majority of xz code is Public Domain. Only some scripts copied from gzip and adjusted for xz purposes are GPLv2+. Version: 5.2.0-1 --- xz.spec | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/xz.spec b/xz.spec index 6202ebf..53c38b7 100644 --- a/xz.spec +++ b/xz.spec @@ -1,10 +1,17 @@ %global compat_ver xz-4.999.9beta +# Not needed for f21+ and probably RHEL8+ +%{!?_licensedir:%global license %%doc} + Summary: LZMA compression utilities Name: xz Version: 5.2.0 Release: 1%{?dist} -License: LGPLv2+ + +# Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are +# GPLv2+, binaries are Public Domain (linked against LGPL getopt_long but its +# OK), documentation is Public Domain. +License: GPLv2+ and Public Domain Group: Applications/File # official upstream release Source0: http://tukaani.org/%{name}/%{name}-%{version}.tar.xz @@ -31,7 +38,7 @@ decompression speed fast. %package libs Summary: Libraries for decoding LZMA compression Group: System Environment/Libraries -License: LGPLv2+ +License: Public Domain %description libs Libraries for decoding files compressed with LZMA or XZ utils. @@ -39,7 +46,7 @@ Libraries for decoding files compressed with LZMA or XZ utils. %package static Summary: Statically linked library for decoding LZMA compression Group: System Environment/Libraries -License: LGPLv2+ +License: Public Domain %description static Statically linked library for decoding files compressed with LZMA or @@ -48,7 +55,7 @@ XZ utils. Most users should *not* install this. %package compat-libs Summary: Compatibility libraries for decoding LZMA compression Group: System Environment/Libraries -License: LGPLv2+ +License: Public Domain %description compat-libs Compatibility libraries for decoding files compressed with LZMA or XZ utils. @@ -57,7 +64,7 @@ This particular package ships libraries from %{compat_ver} as of 1st of April 20 %package devel Summary: Devel libraries & headers for liblzma Group: Development/Libraries -License: LGPLv2+ +License: Public Domain Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: pkgconfig @@ -67,8 +74,8 @@ Devel libraries and headers for liblzma. %package lzma-compat Summary: Older LZMA format compatibility binaries Group: Development/Libraries -# lz{grep,diff,more} are GPLv2+. Other binaries are LGPLv2+ -License: GPLv2+ and LGPLv2+ +# Just a set of symlinks to 'xz' + two Public Domain binaries. +License: Public Domain Requires: %{name}%{?_isa} = %{version}-%{release} Obsoletes: lzma < %{version} Provides: lzma = %{version} @@ -129,26 +136,23 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %postun compat-libs -p /sbin/ldconfig %files -f %{name}.lang -%{!?_licensedir:%global license %%doc} -%license COPYING* -%doc %{_docdir} +%license %{_pkgdocdir}/COPYING* +%doc %{_pkgdocdir} +%exclude %_pkgdocdir/examples* %{_bindir}/*xz* %{_mandir}/man1/*xz* %{profiledir}/* %files libs -%{!?_licensedir:%global license %%doc} -%license COPYING* +%license %{_pkgdocdir}/COPYING %{_libdir}/lib*.so.5* %files static -%{!?_licensedir:%global license %%doc} -%license COPYING* +%license %{_pkgdocdir}/COPYING %{_libdir}/liblzma.a %files compat-libs -%{!?_licensedir:%global license %%doc} -%license COPYING* +%license %{_pkgdocdir}/COPYING %{_libdir}/lib*.so.0* %files devel @@ -157,6 +161,7 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %{_includedir}/lzma.h %{_libdir}/*.so %{_libdir}/pkgconfig/liblzma.pc +%doc %_pkgdocdir/examples* %files lzma-compat %{_bindir}/*lz* @@ -166,7 +171,7 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check * Tue Dec 23 2014 Pavel Raiskup - 5.2.0-1 - rebase per upstream release notes (#1023718) http://www.mail-archive.com/xz-devel@tukaani.org/msg00216.html -- fedora-review fixes +- fedora-review fixes, documentation/license fixes in spec * Tue Aug 26 2014 Pavel Raiskup - 5.1.2-15alpha - xz*grep's output is colored iff grep's is (#1034846) From b9d7aae80bac35a45d74fa4d9f166103d4b97d40 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 4 Feb 2015 14:04:37 +0000 Subject: [PATCH 48/67] Depend on grep that contains grepconf.sh (#1189120) --- xz.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/xz.spec b/xz.spec index 53c38b7..7ec725b 100644 --- a/xz.spec +++ b/xz.spec @@ -6,7 +6,7 @@ Summary: LZMA compression utilities Name: xz Version: 5.2.0 -Release: 1%{?dist} +Release: 2%{?dist} # Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are # GPLv2+, binaries are Public Domain (linked against LGPL getopt_long but its @@ -24,6 +24,11 @@ Source101: colorxzgrep.csh URL: http://tukaani.org/%{name}/ Requires: %{name}-libs%{?_isa} = %{version}-%{release} +# For /usr/libexec/grepconf.sh (RHBZ#1189120). +# Unfortunately F21 has a newer version of grep which doesn't +# have grepconf, but we're only concerned with F22 here. +Requires: grep >= 2.20-5 + %description XZ Utils are an attempt to make LZMA compression easy to use on free (as in @@ -168,6 +173,9 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %{_mandir}/man1/*lz* %changelog +* Wed Feb 04 2015 Richard W.M. Jones - 5.2.0-2 +- Depend on grep that contains grepconf.sh (#1189120) + * Tue Dec 23 2014 Pavel Raiskup - 5.2.0-1 - rebase per upstream release notes (#1023718) http://www.mail-archive.com/xz-devel@tukaani.org/msg00216.html From 85e1e285bb8c8d2ce58587683cdff3806415132d Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Fri, 27 Feb 2015 08:40:07 +0100 Subject: [PATCH 49/67] xz: rebase to recent minor release Per upstream release notes: http://www.mail-archive.com/xz-devel@tukaani.org/msg00226.html Version: 5.2.1-1 --- .gitignore | 2 +- sources | 2 +- xz.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 18d21b8..17a035d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /xz-4.999.9beta.20100401git.tar.bz2 -/xz-5.2.0.tar.xz +/xz-5.2.1.tar.xz diff --git a/sources b/sources index 3a6aaca..ba47437 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 3aa7bbfaa2d5a87f65c23224b9016006 xz-4.999.9beta.20100401git.tar.bz2 -d87c242778fcf5ce4598de80a55ded28 xz-5.2.0.tar.xz +b5e2dd95dc8498cea5354377ed89aa65 xz-5.2.1.tar.xz diff --git a/xz.spec b/xz.spec index 7ec725b..dc41488 100644 --- a/xz.spec +++ b/xz.spec @@ -5,8 +5,8 @@ Summary: LZMA compression utilities Name: xz -Version: 5.2.0 -Release: 2%{?dist} +Version: 5.2.1 +Release: 1%{?dist} # Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are # GPLv2+, binaries are Public Domain (linked against LGPL getopt_long but its @@ -27,7 +27,7 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} # For /usr/libexec/grepconf.sh (RHBZ#1189120). # Unfortunately F21 has a newer version of grep which doesn't # have grepconf, but we're only concerned with F22 here. -Requires: grep >= 2.20-5 +Requires: grep >= 2.20-5 %description @@ -173,6 +173,10 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %{_mandir}/man1/*lz* %changelog +* Fri Feb 27 2015 Pavel Raiskup - 5.2.1-1 +- bugfix rebase to 5.2.1 (rhbz#1196786), per release notes + http://www.mail-archive.com/xz-devel@tukaani.org/msg00226.html + * Wed Feb 04 2015 Richard W.M. Jones - 5.2.0-2 - Depend on grep that contains grepconf.sh (#1189120) From 71848cf63720ac48b1f54bc7fab7771ea7e59c4c Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Fri, 27 Feb 2015 08:51:59 +0100 Subject: [PATCH 50/67] typo: remove wrongly mentioned rhbz id Version: 5.2.1-1 --- xz.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xz.spec b/xz.spec index dc41488..2283eb6 100644 --- a/xz.spec +++ b/xz.spec @@ -174,7 +174,7 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %changelog * Fri Feb 27 2015 Pavel Raiskup - 5.2.1-1 -- bugfix rebase to 5.2.1 (rhbz#1196786), per release notes +- bugfix rebase to 5.2.1, per release notes http://www.mail-archive.com/xz-devel@tukaani.org/msg00226.html * Wed Feb 04 2015 Richard W.M. Jones - 5.2.0-2 From 2e9b0cb3c9aef16c419312f09d571a1bf90060be Mon Sep 17 00:00:00 2001 From: Jaromir Capik Date: Mon, 15 Jun 2015 18:46:47 +0200 Subject: [PATCH 51/67] Adding STAGE1 bootstrap recipe --- STAGE1-xz | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 STAGE1-xz diff --git a/STAGE1-xz b/STAGE1-xz new file mode 100644 index 0000000..c240fe9 --- /dev/null +++ b/STAGE1-xz @@ -0,0 +1,9 @@ +srpm xz +mcd $BUILDDIR/$1 +$SRC/${1}-*/configure \ + --prefix=/usr \ + --libdir=/usr/lib64 \ + --build=$BUILD \ + --host=$TARGET +make $J V=1 +make $J install DESTDIR=${ROOTFS} From 2f19c9b0573a09f58271ef475998f4847ece1eb4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:32:29 +0000 Subject: [PATCH 52/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- xz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xz.spec b/xz.spec index 2283eb6..ef5ccbb 100644 --- a/xz.spec +++ b/xz.spec @@ -6,7 +6,7 @@ Summary: LZMA compression utilities Name: xz Version: 5.2.1 -Release: 1%{?dist} +Release: 2%{?dist} # Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are # GPLv2+, binaries are Public Domain (linked against LGPL getopt_long but its @@ -173,6 +173,9 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %{_mandir}/man1/*lz* %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 5.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Fri Feb 27 2015 Pavel Raiskup - 5.2.1-1 - bugfix rebase to 5.2.1, per release notes http://www.mail-archive.com/xz-devel@tukaani.org/msg00226.html From ab17568e3586d3614fc3866624cd38832d992def Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Tue, 6 Jan 2015 14:01:39 +0100 Subject: [PATCH 53/67] spec: remove xz-compat-libs Resolves: #1179193 Version: 5.2.1-3 --- xz.spec | 38 ++++++-------------------------------- 1 file changed, 6 insertions(+), 32 deletions(-) diff --git a/xz.spec b/xz.spec index ef5ccbb..0a4eea7 100644 --- a/xz.spec +++ b/xz.spec @@ -1,12 +1,10 @@ -%global compat_ver xz-4.999.9beta - # Not needed for f21+ and probably RHEL8+ %{!?_licensedir:%global license %%doc} Summary: LZMA compression utilities Name: xz Version: 5.2.1 -Release: 2%{?dist} +Release: 3%{?dist} # Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are # GPLv2+, binaries are Public Domain (linked against LGPL getopt_long but its @@ -15,8 +13,6 @@ License: GPLv2+ and Public Domain Group: Applications/File # official upstream release Source0: http://tukaani.org/%{name}/%{name}-%{version}.tar.xz -# source created as "make dist" in checked out GIT tree -Source1: %{compat_ver}.20100401git.tar.bz2 Source100: colorxzgrep.sh Source101: colorxzgrep.csh @@ -44,6 +40,7 @@ decompression speed fast. Summary: Libraries for decoding LZMA compression Group: System Environment/Libraries License: Public Domain +Obsoletes: %{name}-compat-libs < %{version}-%{release} %description libs Libraries for decoding files compressed with LZMA or XZ utils. @@ -57,15 +54,6 @@ License: Public Domain Statically linked library for decoding files compressed with LZMA or XZ utils. Most users should *not* install this. -%package compat-libs -Summary: Compatibility libraries for decoding LZMA compression -Group: System Environment/Libraries -License: Public Domain - -%description compat-libs -Compatibility libraries for decoding files compressed with LZMA or XZ utils. -This particular package ships libraries from %{compat_ver} as of 1st of April 2010. - %package devel Summary: Devel libraries & headers for liblzma Group: Development/Libraries @@ -90,7 +78,7 @@ The lzma-compat package contains compatibility links for older commands that deal with the older LZMA format. %prep -%setup -q -a1 +%setup -q for i in `find . -name config.sub`; do perl -pi -e "s/ppc64-\*/ppc64-\* \| ppc64p7-\*/" $i @@ -108,19 +96,10 @@ sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make %{?_smp_mflags} -pushd %{compat_ver} -%configure -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make %{?_smp_mflags} -popd - %install make install DESTDIR=%{buildroot} rm -f %{buildroot}%{_libdir}/*.la -cp -r %{compat_ver}/src/liblzma/.libs/liblzma.so.0* %{buildroot}%{_libdir} - # xzgrep colorization %global profiledir %{_sysconfdir}/profile.d mkdir -p %{buildroot}%{profiledir} @@ -136,10 +115,6 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %postun libs -p /sbin/ldconfig -%post compat-libs -p /sbin/ldconfig - -%postun compat-libs -p /sbin/ldconfig - %files -f %{name}.lang %license %{_pkgdocdir}/COPYING* %doc %{_pkgdocdir} @@ -156,10 +131,6 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %license %{_pkgdocdir}/COPYING %{_libdir}/liblzma.a -%files compat-libs -%license %{_pkgdocdir}/COPYING -%{_libdir}/lib*.so.0* - %files devel %dir %{_includedir}/lzma %{_includedir}/lzma/*.h @@ -173,6 +144,9 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %{_mandir}/man1/*lz* %changelog +* Thu Jul 09 2015 Pavel Raiskup - 5.2.1-3 +- remove xz-compat-libs as it is not necessary (#1179193) + * Fri Jun 19 2015 Fedora Release Engineering - 5.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 9d7db2c28d0a9f97ebda0d6c767ae795d940e8ce Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Tue, 29 Sep 2015 15:01:18 +0200 Subject: [PATCH 54/67] rebase to stable 5.2.2 Remove outdated items in .gitignore and sources. Version: 5.2.2-1 --- .gitignore | 3 +-- sources | 3 +-- xz.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 17a035d..3d4a138 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/xz-4.999.9beta.20100401git.tar.bz2 -/xz-5.2.1.tar.xz +/xz-5.2.2.tar.xz diff --git a/sources b/sources index ba47437..5bc982a 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -3aa7bbfaa2d5a87f65c23224b9016006 xz-4.999.9beta.20100401git.tar.bz2 -b5e2dd95dc8498cea5354377ed89aa65 xz-5.2.1.tar.xz +e26772b69940085c0632589ab1d52e64 xz-5.2.2.tar.xz diff --git a/xz.spec b/xz.spec index 0a4eea7..fd8bde9 100644 --- a/xz.spec +++ b/xz.spec @@ -3,8 +3,8 @@ Summary: LZMA compression utilities Name: xz -Version: 5.2.1 -Release: 3%{?dist} +Version: 5.2.2 +Release: 1%{?dist} # Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are # GPLv2+, binaries are Public Domain (linked against LGPL getopt_long but its @@ -144,6 +144,10 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %{_mandir}/man1/*lz* %changelog +* Tue Sep 29 2015 Pavel Raiskup - 5.2.2-1 +- rebase to stable 5.2.2 per release notes: + http://www.mail-archive.com/xz-devel@tukaani.org/msg00244.html + * Thu Jul 09 2015 Pavel Raiskup - 5.2.1-3 - remove xz-compat-libs as it is not necessary (#1179193) From 449a17e3b30b4ba1b4b91c2be8b64b6da5f96b8c Mon Sep 17 00:00:00 2001 From: Jaromir Capik Date: Thu, 3 Dec 2015 14:54:57 +0100 Subject: [PATCH 55/67] Fixing hardcoded lib64 path in the stage1 recipe --- STAGE1-xz | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/STAGE1-xz b/STAGE1-xz index c240fe9..d613473 100644 --- a/STAGE1-xz +++ b/STAGE1-xz @@ -2,7 +2,7 @@ srpm xz mcd $BUILDDIR/$1 $SRC/${1}-*/configure \ --prefix=/usr \ - --libdir=/usr/lib64 \ + --libdir=/usr/lib${SUFFIX} \ --build=$BUILD \ --host=$TARGET make $J V=1 From 3d0c4e5880c61794db2a8ce07b71c8e8c4364d77 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:54:21 +0000 Subject: [PATCH 56/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- xz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xz.spec b/xz.spec index fd8bde9..a954c49 100644 --- a/xz.spec +++ b/xz.spec @@ -4,7 +4,7 @@ Summary: LZMA compression utilities Name: xz Version: 5.2.2 -Release: 1%{?dist} +Release: 2%{?dist} # Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are # GPLv2+, binaries are Public Domain (linked against LGPL getopt_long but its @@ -144,6 +144,9 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %{_mandir}/man1/*lz* %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 5.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Sep 29 2015 Pavel Raiskup - 5.2.2-1 - rebase to stable 5.2.2 per release notes: http://www.mail-archive.com/xz-devel@tukaani.org/msg00244.html From e94ff72743fc7fa33f138512b3f358660014d38e Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 28 Nov 2016 20:20:40 +0100 Subject: [PATCH 57/67] Fix FTBFS by requiring Perl --- xz.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xz.spec b/xz.spec index a954c49..741fcba 100644 --- a/xz.spec +++ b/xz.spec @@ -4,7 +4,7 @@ Summary: LZMA compression utilities Name: xz Version: 5.2.2 -Release: 2%{?dist} +Release: 3%{?dist} # Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are # GPLv2+, binaries are Public Domain (linked against LGPL getopt_long but its @@ -25,6 +25,8 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} # have grepconf, but we're only concerned with F22 here. Requires: grep >= 2.20-5 +BuildRequires: perl + %description XZ Utils are an attempt to make LZMA compression easy to use on free (as in @@ -144,6 +146,9 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %{_mandir}/man1/*lz* %changelog +* Mon Nov 28 2016 Lubomir Rintel - 5.2.2-3 +- Fix FTBFS by requiring Perl + * Fri Feb 05 2016 Fedora Release Engineering - 5.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 2682d51e8c8e6f8aadad344a3d7f24d44979ccc9 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 2 Jan 2017 13:25:53 +0100 Subject: [PATCH 58/67] rebase to stable 5.2.3 Per release notes: http://www.mail-archive.com/xz-devel@tukaani.org/msg00285.html Version: 5.2.3-1 Resolves: rhbz#1409276 --- xz.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xz.spec b/xz.spec index 741fcba..ab307e0 100644 --- a/xz.spec +++ b/xz.spec @@ -3,8 +3,8 @@ Summary: LZMA compression utilities Name: xz -Version: 5.2.2 -Release: 3%{?dist} +Version: 5.2.3 +Release: 1%{?dist} # Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are # GPLv2+, binaries are Public Domain (linked against LGPL getopt_long but its @@ -146,6 +146,10 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %{_mandir}/man1/*lz* %changelog +* Mon Jan 02 2017 Pavel Raiskup - 5.2.3-1 +- rebase to stable 5.2.3 per release notes: + http://www.mail-archive.com/xz-devel@tukaani.org/msg00285.html + * Mon Nov 28 2016 Lubomir Rintel - 5.2.2-3 - Fix FTBFS by requiring Perl From b33e8a326827bdc8588d25e920ad03b98ebf22a2 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Mon, 2 Jan 2017 15:27:07 +0100 Subject: [PATCH 59/67] add also sources Version: 5.2.3-1 --- .gitignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3d4a138..e2ec6e7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/xz-5.2.2.tar.xz +/xz-5.2.3.tar.xz diff --git a/sources b/sources index 5bc982a..f22f87c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e26772b69940085c0632589ab1d52e64 xz-5.2.2.tar.xz +SHA512 (xz-5.2.3.tar.xz) = a5b8f3c402ec3df5c1875a32081136606dd7701190d8b8091bae1bac36553ebe3480985c8069bf5d9e24f374ea64b1fe22614d3eebac1c10e5d609701bceca95 From c27811574cdf7de35217ea27b8add4c0130de53e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 18:13:01 +0000 Subject: [PATCH 60/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- xz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xz.spec b/xz.spec index ab307e0..6bc1ddb 100644 --- a/xz.spec +++ b/xz.spec @@ -4,7 +4,7 @@ Summary: LZMA compression utilities Name: xz Version: 5.2.3 -Release: 1%{?dist} +Release: 2%{?dist} # Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are # GPLv2+, binaries are Public Domain (linked against LGPL getopt_long but its @@ -146,6 +146,9 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %{_mandir}/man1/*lz* %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 5.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Jan 02 2017 Pavel Raiskup - 5.2.3-1 - rebase to stable 5.2.3 per release notes: http://www.mail-archive.com/xz-devel@tukaani.org/msg00285.html From c14c321a84176173dc123e356a9d27e9ee02b928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 12 Jul 2017 14:55:15 +0200 Subject: [PATCH 61/67] perl dependency renamed to perl-interpreter --- xz.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xz.spec b/xz.spec index 6bc1ddb..a3cf897 100644 --- a/xz.spec +++ b/xz.spec @@ -25,7 +25,7 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} # have grepconf, but we're only concerned with F22 here. Requires: grep >= 2.20-5 -BuildRequires: perl +BuildRequires: perl-interpreter %description From 522f5e42341ae3ce5f15317961f35901ae8467e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:31:01 +0000 Subject: [PATCH 62/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- xz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xz.spec b/xz.spec index a3cf897..7a78a0d 100644 --- a/xz.spec +++ b/xz.spec @@ -4,7 +4,7 @@ Summary: LZMA compression utilities Name: xz Version: 5.2.3 -Release: 2%{?dist} +Release: 3%{?dist} # Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are # GPLv2+, binaries are Public Domain (linked against LGPL getopt_long but its @@ -146,6 +146,9 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %{_mandir}/man1/*lz* %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 5.2.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 5.2.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 3f9bd005b879471a52b4bf1154e45402a695025b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 11:03:06 +0000 Subject: [PATCH 63/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- xz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xz.spec b/xz.spec index 7a78a0d..ecd82e6 100644 --- a/xz.spec +++ b/xz.spec @@ -4,7 +4,7 @@ Summary: LZMA compression utilities Name: xz Version: 5.2.3 -Release: 3%{?dist} +Release: 4%{?dist} # Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are # GPLv2+, binaries are Public Domain (linked against LGPL getopt_long but its @@ -146,6 +146,9 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %{_mandir}/man1/*lz* %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 5.2.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 5.2.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 4a585f3c89acbcc0d5ceb06d14cfff445331f05c Mon Sep 17 00:00:00 2001 From: Vascom Date: Wed, 13 Sep 2017 14:28:26 +0300 Subject: [PATCH 64/67] Cleanup spec. --- xz.spec | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/xz.spec b/xz.spec index ecd82e6..dc79ed2 100644 --- a/xz.spec +++ b/xz.spec @@ -4,13 +4,12 @@ Summary: LZMA compression utilities Name: xz Version: 5.2.3 -Release: 4%{?dist} +Release: 5%{?dist} # Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are # GPLv2+, binaries are Public Domain (linked against LGPL getopt_long but its # OK), documentation is Public Domain. License: GPLv2+ and Public Domain -Group: Applications/File # official upstream release Source0: http://tukaani.org/%{name}/%{name}-%{version}.tar.xz @@ -18,7 +17,6 @@ Source100: colorxzgrep.sh Source101: colorxzgrep.csh URL: http://tukaani.org/%{name}/ -Requires: %{name}-libs%{?_isa} = %{version}-%{release} # For /usr/libexec/grepconf.sh (RHBZ#1189120). # Unfortunately F21 has a newer version of grep which doesn't @@ -40,7 +38,6 @@ decompression speed fast. %package libs Summary: Libraries for decoding LZMA compression -Group: System Environment/Libraries License: Public Domain Obsoletes: %{name}-compat-libs < %{version}-%{release} @@ -49,7 +46,6 @@ Libraries for decoding files compressed with LZMA or XZ utils. %package static Summary: Statically linked library for decoding LZMA compression -Group: System Environment/Libraries License: Public Domain %description static @@ -58,17 +54,13 @@ XZ utils. Most users should *not* install this. %package devel Summary: Devel libraries & headers for liblzma -Group: Development/Libraries License: Public Domain -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: pkgconfig %description devel Devel libraries and headers for liblzma. %package lzma-compat Summary: Older LZMA format compatibility binaries -Group: Development/Libraries # Just a set of symlinks to 'xz' + two Public Domain binaries. License: Public Domain Requires: %{name}%{?_isa} = %{version}-%{release} @@ -80,7 +72,7 @@ The lzma-compat package contains compatibility links for older commands that deal with the older LZMA format. %prep -%setup -q +%autosetup for i in `find . -name config.sub`; do perl -pi -e "s/ppc64-\*/ppc64-\* \| ppc64p7-\*/" $i @@ -96,10 +88,10 @@ export CFLAGS %configure sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=%{buildroot} +%make_install rm -f %{buildroot}%{_libdir}/*.la # xzgrep colorization @@ -146,6 +138,9 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %{_mandir}/man1/*lz* %changelog +* Wed Sep 13 2017 Vasiliy N. Glazov - 5.2.3.-5 +- Cleanup spec + * Thu Aug 03 2017 Fedora Release Engineering - 5.2.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From e98ab5c6e9395a51a716c3369257eb11448ee98f Mon Sep 17 00:00:00 2001 From: vascom Date: Wed, 13 Sep 2017 13:38:54 +0000 Subject: [PATCH 65/67] Revert libs dependency. Second try clean spec. --- xz.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xz.spec b/xz.spec index dc79ed2..c8b86f6 100644 --- a/xz.spec +++ b/xz.spec @@ -17,6 +17,7 @@ Source100: colorxzgrep.sh Source101: colorxzgrep.csh URL: http://tukaani.org/%{name}/ +Requires: %{name}-libs%{?_isa} = %{version}-%{release} # For /usr/libexec/grepconf.sh (RHBZ#1189120). # Unfortunately F21 has a newer version of grep which doesn't @@ -55,6 +56,7 @@ XZ utils. Most users should *not* install this. %package devel Summary: Devel libraries & headers for liblzma License: Public Domain +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description devel Devel libraries and headers for liblzma. From 1cbf267b2c7c6df037a4d371951ab464763ecb6b Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 2 Feb 2018 11:18:14 +0100 Subject: [PATCH 66/67] Switch to %ldconfig_scriptlets Signed-off-by: Igor Gnatenko --- xz.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/xz.spec b/xz.spec index c8b86f6..94a05a6 100644 --- a/xz.spec +++ b/xz.spec @@ -4,7 +4,7 @@ Summary: LZMA compression utilities Name: xz Version: 5.2.3 -Release: 5%{?dist} +Release: 6%{?dist} # Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are # GPLv2+, binaries are Public Domain (linked against LGPL getopt_long but its @@ -107,9 +107,7 @@ install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir} %check LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check -%post libs -p /sbin/ldconfig - -%postun libs -p /sbin/ldconfig +%ldconfig_scriptlets libs %files -f %{name}.lang %license %{_pkgdocdir}/COPYING* @@ -140,6 +138,9 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %{_mandir}/man1/*lz* %changelog +* Fri Feb 02 2018 Igor Gnatenko - 5.2.3-6 +- Switch to %%ldconfig_scriptlets + * Wed Sep 13 2017 Vasiliy N. Glazov - 5.2.3.-5 - Cleanup spec From 8146a1571fbadac7e80e448b871a1f043fde5c08 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 22:11:53 +0000 Subject: [PATCH 67/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xz.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xz.spec b/xz.spec index 94a05a6..1f5e7ed 100644 --- a/xz.spec +++ b/xz.spec @@ -4,7 +4,7 @@ Summary: LZMA compression utilities Name: xz Version: 5.2.3 -Release: 6%{?dist} +Release: 7%{?dist} # Scripts xz{grep,diff,less,more} and symlinks (copied from gzip) are # GPLv2+, binaries are Public Domain (linked against LGPL getopt_long but its @@ -138,6 +138,9 @@ LD_LIBRARY_PATH=$PWD/src/liblzma/.libs make check %{_mandir}/man1/*lz* %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 5.2.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Fri Feb 02 2018 Igor Gnatenko - 5.2.3-6 - Switch to %%ldconfig_scriptlets