From 0b1102985413b2126d8d2b2dd1c747d671e8a716f027f0fc112d8e5028e8a702 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Sat, 22 Aug 2009 01:40:19 +0000 Subject: [PATCH] Accepting request 18441 from Base:System Copy from Base:System/xz based on submit request 18441 from user coolo OBS-URL: https://build.opensuse.org/request/show/18441 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xz?expand=0&rev=6 --- nostatic.diff | 25 ---------- xz-git.diff.bz2 | 3 ++ xz.changes | 13 +++++ xz.spec | 126 ++++-------------------------------------------- 4 files changed, 25 insertions(+), 142 deletions(-) delete mode 100644 nostatic.diff create mode 100644 xz-git.diff.bz2 diff --git a/nostatic.diff b/nostatic.diff deleted file mode 100644 index b437d74..0000000 --- a/nostatic.diff +++ /dev/null @@ -1,25 +0,0 @@ -Index: src/lzmadec/Makefile.am -================================================================================ ---- src/xz/Makefile.am -+++ src/xz/Makefile.am -@@ -42,10 +42,6 @@ xz_CPPFLAGS = \ - -I@top_builddir@/lib \ - -I@top_srcdir@/lib - --## Always link the command line tool statically against liblzma. It is --## faster on x86, because no need for PIC. We also have one dependency less, --## which allows users to more freely copy the xz binary to other boxes. --xz_LDFLAGS = -static - xz_LDADD = \ - @top_builddir@/src/liblzma/liblzma.la \ - @LTLIBINTL@ ---- src/xzdec/Makefile.am -+++ src/xzdec/Makefile.am -@@ -19,7 +19,6 @@ xzdec_CPPFLAGS = \ - -I@top_srcdir@/src/common \ - -I@top_srcdir@/src/liblzma/api \ - -I@top_builddir@/lib --xzdec_LDFLAGS = -static - xzdec_LDADD = \ - @top_builddir@/src/liblzma/liblzma.la \ - @LTLIBINTL@ diff --git a/xz-git.diff.bz2 b/xz-git.diff.bz2 new file mode 100644 index 0000000..3f87b25 --- /dev/null +++ b/xz-git.diff.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b2a205768fe1bf0bd04eddcf7b379d96117fdd5fcb3f2aa02e81d4a6f5c3fe4 +size 545877 diff --git a/xz.changes b/xz.changes index 9a41c82..38f96a4 100644 --- a/xz.changes +++ b/xz.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Aug 20 15:51:47 CEST 2009 - coolo@novell.com + +- update to latest git (5.0 still not released) + * a xz man page (bnc#505969) + * fix data corruption in LZ/LZMA2 encoder. + * major documentation update + * install lzdiff, lzgrep, and lzmore as symlinks + * make the default memory usage limit 40 % of RAM for both + compressing and decompressing. + * fixed a crash in liblzma + See git://ctrl.tukaani.org/xz.git for more + ------------------------------------------------------------------- Sun Jun 7 19:39:45 CEST 2009 - crrodriguez@suse.de diff --git a/xz.spec b/xz.spec index f718140..98cb355 100644 --- a/xz.spec +++ b/xz.spec @@ -1,5 +1,5 @@ # -# spec file for package xz (Version 4.999.8beta) +# spec file for package xz (Version 4.999.8git) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,13 +19,13 @@ Name: xz Summary: A Program for Compressing Files -Version: 4.999.8beta -Release: 5 +Version: 4.999.8git +Release: 1 Group: Productivity/Archiving/Compression License: GPL v2 or later Url: http://tukaani.org/lzma/ -Source: %{name}-%{version}.tar.bz2 -Patch: nostatic.diff +Source: %{name}-4.999.8beta.tar.bz2 +Patch0: xz-git.diff.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: lzma = %version Obsoletes: lzma < %version @@ -50,14 +50,6 @@ The xz command is a very powerful program for compressing files. * Very similar command line interface to what gzip and bzip2 have. - - -Authors: --------- - Igor Pavlov - Ville Koskinen - Lasse Collin - %package -n liblzma0 License: LGPL v2.1 or later Summary: LZMA library @@ -66,14 +58,6 @@ Group: System/Libraries %description -n liblzma0 Library for encoding/decoding LZMA files. - - -Authors: --------- - Igor Pavlov - Ville Koskinen - Lasse Collin - %package devel License: LGPL v2.1 or later Summary: Development package for the LZMA library @@ -88,21 +72,13 @@ Obsoletes: lzma-alpha-devel < %version This package contains the header files and libraries needed for compiling programs using the LZMA library. - - -Authors: --------- - Igor Pavlov - Ville Koskinen - Lasse Collin - %prep -%setup -q -%patch +%setup -q -n %{name}-4.999.8beta +%patch0 -p1 %build AUTOPOINT=true autoreconf -fi -%configure --libdir=/%{_lib} --disable-static --with-pic +%configure --libdir=/%{_lib} --disable-static --with-pic --docdir=%_docdir/%name make %{?jobs:-j%jobs} %install @@ -121,7 +97,7 @@ rm -fr $RPM_BUILD_ROOT %files %defattr(-, root, root) -%doc README doc/file-format.txt +%_docdir/%name %{_bindir}/* %{_mandir}/man?/* @@ -137,87 +113,3 @@ rm -fr $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog -* Sun Jun 07 2009 crrodriguez@suse.de -- remove static libraries, see bnc#509945 for details -* Sun Feb 22 2009 ro@suse.de -- added baselibs.conf (for rpm-32bit) -* Mon Feb 16 2009 coolo@suse.de -- use bzip payload, so users are able to install new rpm on old systems -* Wed Feb 11 2009 coolo@suse.de -- fix devel symlink -* Fri Feb 06 2009 schwab@suse.de -- Update to xz-4.999.8beta. - See git://ctrl.tukaani.org/lzma-utils.git. -* Wed Jan 07 2009 schwab@suse.de -- Update to xz-4.999.7beta. - See git://ctrl.tukaani.org/lzma-utils.git. -- Rename to xz. -* Wed Jul 30 2008 schwab@suse.de -- Update to lzma-4.32.7. - * If "lzma -t" is run on a corrupt file or interrupted by a signal, - don't unlink /dev/null. - * Partial fix to race conditions where a signal could make lzma to - unlink both the source and destination files. Now it cannot lose - data anymore, but with bad luck an incomplete file may be left - on the disk. -* Wed May 14 2008 schwab@suse.de -- Update to lzma-4.32.6. - * Always use 32-bit integer to hold probability variables. Earlier, - these were 64-bit on 64-bit architectures, which hurt cache - efficiency in the CPU, and thus performance of LZMA. 32-bit - architectures are not affected by this change. - * Fix a theoretical data corruption bug in the LZMA encoder. It is - about overflowing a 32-bit integer, whose typical value stays below - five. I don't know if it is actually possible to construct to a file - that could make it overflow. Even if it were possible, it would "only" - make the output file corrupt so that it is 4 GiB too small; there - are no other security risks. Now the integer is 64-bit to be sure - it won't overflow. - * Add support for copying timestamps on operating systems that support - setting timestamps only by filename, not by file descriptor. - * Several portability fixes were made. -* Fri May 09 2008 schwab@suse.de -- Revert last changes. -* Tue May 06 2008 bk@suse.de -- ci removed #neededforbuild while mbuild converts to BuildRequires -- bzip2 source to save space (not lzma, so it can be built in <11.0) -* Tue May 06 2008 bk@suse.de -- run the package-provided self-test by adding a call to 'make check' -- use %%configure instead of equivalent configure call with options -- improved to allow building in SLES and non-SUSE repositories, eg: - - replace obsolete nostatic patch with check for static objects - - use more generic wildcards in the file list for manual pages -* Mon Feb 04 2008 schwab@suse.de -- Fix installation. -* Mon Feb 04 2008 schwab@suse.de -- Update to lzma-4.32.5. - * The percentage shown when --verbose is used, works again. Also some - typos were fixed from the messages printed by --verbose. - * Several small portability fixes were made. -* Fri Jan 04 2008 crrodriguez@suse.de -- Version 4.32.4 - * Ignore command line switch --format=alone. This way current scripts - can be written so that they will produce LZMA_Alone format files - even with the new command line tool once it is finishes along with - liblzma. - * The command line tool now tells if the user tries to decode files - in the new .lzma format. The message recommends upgrading to newer - LZMA Utils. - * Added some internal consistency checks to liblzmadec, so that it - doesn't crash if given lzmadec_stream whose initialization failed. - Some applications using zlib and libbzip2 don't check if - initialization was successful, and expect that error gets caught - safely later. -- disable static libraries -- remove liblzmadec.la that has empty dependency_libs -- do not link utils statically -* Mon Dec 03 2007 dmueller@suse.de -- update to 4.32.3: - * rare file content loss bugs fixed (did not check for error upon close()) - * permissions copying fixed -- testsuited switched partially to GPLv3 -- fix library package name -* Thu Oct 11 2007 schwab@suse.de -- Fix missing include. -* Wed Oct 10 2007 schwab@suse.de -- Initial version 4.32.0beta5.