diff --git a/.xz.metadata b/.xz.metadata new file mode 100644 index 0000000..1674c20 --- /dev/null +++ b/.xz.metadata @@ -0,0 +1,2 @@ +bb0fd27570627e7316927619494568de3414402a SOURCES/xz-4.999.9beta.20100401git.tar.bz2 +b161f85b16cb86725022b8c58bce2c8228158852 SOURCES/xz-5.1.2alpha.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/xz-5.1.2alpha-man-page-day.patch b/SOURCES/xz-5.1.2alpha-man-page-day.patch new file mode 100644 index 0000000..1d15a59 --- /dev/null +++ b/SOURCES/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/SOURCES/xz-5.1.2alpha-xzgrep-and-h-option.patch b/SOURCES/xz-5.1.2alpha-xzgrep-and-h-option.patch new file mode 100644 index 0000000..dfbdf35 --- /dev/null +++ b/SOURCES/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/SPECS/xz.spec b/SPECS/xz.spec new file mode 100644 index 0000000..2b098aa --- /dev/null +++ b/SPECS/xz.spec @@ -0,0 +1,258 @@ +%global compat_ver xz-4.999.9beta + +Summary: LZMA compression utilities +Name: xz +Version: 5.1.2 +Release: 5alpha%{?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 +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 + +# fix 'xzgrep -h' to behave as expected +# ~> upstream (5019413a0) +# ~> #850898 +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 +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 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 %{compat_ver} as of 1st of April 2010. + +%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 < %{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 -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 +done + +%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} + +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" +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 + +%clean +rm -rf %{buildroot} + +%post libs -p /sbin/ldconfig + +%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 +%{_bindir}/*xz* +%{_mandir}/man1/*xz* + +%files libs +%defattr(-,root,root,-) +%doc COPYING* +%{_libdir}/lib*.so.5* + +%files compat-libs +%defattr(-,root,root,-) +%doc COPYING* +%{_libdir}/lib*.so.0* + +%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/*lz* + +%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' (private #850898) + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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) + +* 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 + +* 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 + +* 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 + +* 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