mirror of
https://abf.rosa.ru/djam/xz.git
synced 2025-02-23 18:42:57 +00:00
Updated to release 5.2.9, rediffed P1
This commit is contained in:
Giovanni Mariani
parent
1e5ad64a31
commit
9df09100ea
3 changed files with 64 additions and 50 deletions
2
.abf.yml
2
.abf.yml
|
|
@ -1,2 +1,2 @@
|
|||
sources:
|
||||
xz-5.2.5.tar.xz: 0b9d1e06b59f7fe0796afe1d93851b9306b4a3b6
|
||||
xz-5.2.9.tar.xz: 74a64af856030876c4b815c4b20146f90dab8149
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
--- xz-5.1.3alpha/src/xz/message.c.day 2013-10-26 12:27:12.000000000 +0200
|
||||
+++ xz-5.1.3alpha/src/xz/message.c 2014-02-10 12:58:14.957708913 +0100
|
||||
@@ -1090,7 +1090,8 @@ message_help(bool long_help)
|
||||
diff -rupN xz-5.2.9.old/src/xz/message.c xz-5.2.9/src/xz/message.c
|
||||
--- xz-5.2.9.old/src/xz/message.c 2022-11-24 09:55:48.000000000 +0100
|
||||
+++ xz-5.2.9/src/xz/message.c 2022-12-06 21:32:37.001869018 +0100
|
||||
@@ -1102,7 +1102,8 @@ message_help(bool long_help)
|
||||
|
||||
puts(_(
|
||||
" -z, --compress force compression\n"
|
||||
|
|
@ -10,17 +11,17 @@
|
|||
" -t, --test test compressed file integrity\n"
|
||||
" -l, --list list information about .xz files"));
|
||||
|
||||
@@ -1100,7 +1101,8 @@ message_help(bool long_help)
|
||||
@@ -1112,7 +1113,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(_(
|
||||
@@ -1150,7 +1152,7 @@ message_help(bool long_help)
|
||||
// NOTE: --to-stdout isn't included above because it's not
|
||||
// the recommended spelling. It was copied from gzip but other
|
||||
// compressors with gzip-like syntax don't support it.
|
||||
@@ -1171,7 +1173,7 @@ message_help(bool long_help)
|
||||
puts(_( // xgettext:no-c-format
|
||||
" --memlimit-compress=LIMIT\n"
|
||||
" --memlimit-decompress=LIMIT\n"
|
||||
|
|
@ -29,19 +30,30 @@
|
|||
" set memory usage limit for compression, decompression,\n"
|
||||
" or both; LIMIT is in bytes, % of RAM, or 0 for defaults"));
|
||||
|
||||
--- xz-5.1.3alpha/src/xz/xz.1.day 2013-10-26 12:27:12.000000000 +0200
|
||||
+++ xz-5.1.3alpha/src/xz/xz.1 2014-02-10 12:58:14.957708913 +0100
|
||||
@@ -972,7 +972,7 @@ See
|
||||
diff -rupN xz-5.2.9.old/src/xz/xz.1 xz-5.2.9/src/xz/xz.1
|
||||
--- xz-5.2.9.old/src/xz/xz.1 2022-11-24 09:55:48.000000000 +0100
|
||||
+++ xz-5.2.9/src/xz/xz.1 2022-12-06 21:33:57.184160491 +0100
|
||||
@@ -1064,7 +1064,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
|
||||
This is equivalent to specifying
|
||||
.BI \-\-memlimit\-compress= limit
|
||||
\fB\-\-memlimit\-decompress=\fIlimit\fR.
|
||||
.TP
|
||||
--- xz-5.1.3alpha/src/xzdec/xzdec.c.day 2014-02-10 12:58:14.957708913 +0100
|
||||
+++ xz-5.1.3alpha/src/xzdec/xzdec.c 2014-02-10 13:02:37.107709989 +0100
|
||||
diff -rupN xz-5.2.9.old/src/xzdec/xzdec.c xz-5.2.9/src/xzdec/xzdec.c
|
||||
--- xz-5.2.9.old/src/xzdec/xzdec.c 2022-11-24 09:55:48.000000000 +0100
|
||||
+++ xz-5.2.9/src/xzdec/xzdec.c 2022-12-06 21:35:36.117137979 +0100
|
||||
@@ -23,7 +23,7 @@
|
||||
#include "tuklib_exit.h"
|
||||
|
||||
#ifdef TUKLIB_DOSLIKE
|
||||
-# include <fcntl.h>
|
||||
+// # include <fcntl.h>
|
||||
# include <io.h>
|
||||
#endif
|
||||
|
||||
@@ -65,12 +65,16 @@ help(void)
|
||||
"Decompress files in the ." TOOL_FORMAT " format to standard output.\n"
|
||||
"\n"
|
||||
56
xz.spec
56
xz.spec
|
|
@ -3,44 +3,42 @@
|
|||
%define libname %mklibname %{lname} %{major}
|
||||
%define devname %mklibname %{lname} -d
|
||||
|
||||
%define gitdate 20140129
|
||||
%define gitdate 0
|
||||
|
||||
Summary: XZ utils
|
||||
Name: xz
|
||||
Version: 5.2.5
|
||||
Release: 4
|
||||
Version: 5.2.9
|
||||
Release: 1
|
||||
License: Public Domain
|
||||
Group: Archiving/Compression
|
||||
Url: http://tukaani.org/xz/
|
||||
Source0: http://tukaani.org/xz/%{name}-%{version}.tar.xz
|
||||
Url: https://tukaani.org/xz/
|
||||
Source0: https://tukaani.org/xz/%{name}-%{version}.tar.xz
|
||||
Source1: xzme
|
||||
Patch0: xz-5.2.0-text-tune.patch
|
||||
Patch1: xz-5.1.3alpha-man-page-day.patch
|
||||
Patch1: xz-5.2.9-man-page-day.patch
|
||||
# clearlinux
|
||||
Patch2: speedup.patch
|
||||
Patch3: default-threading.patch
|
||||
Patch4: io-size.patch
|
||||
# needed by check suite
|
||||
# Needed by check suite
|
||||
BuildRequires: diffutils
|
||||
%rename lzma
|
||||
%rename lzma-utils
|
||||
|
||||
%description
|
||||
XZ provides very high compression ratio and fast decompression. The
|
||||
core of the XZ utils is Igor Pavlov's LZMA SDK containing the actual
|
||||
LZMA encoder/decoder. LZMA utils add a few scripts which provide
|
||||
gzip-like command line interface and a couple of other XZ related
|
||||
tools. Also provides:
|
||||
|
||||
- Average compression ratio 30% better than that of gzip and 15%
|
||||
better than that of bzip2.
|
||||
- Decompression speed is only little slower than that of gzip, being
|
||||
two to five times faster than bzip2.
|
||||
- In fast mode, compresses faster than bzip2 with a comparable
|
||||
compression ratio.
|
||||
- Achieving the best compression ratios takes four to even twelve
|
||||
times longer than with bzip2. However. this doesn't affect
|
||||
decompressing speed.
|
||||
XZ provides very high compression ratio and fast decompression. The core of
|
||||
the XZ utils is Igor Pavlov's LZMA SDK containing the actual LZMA
|
||||
encoder/decoder. LZMA utils add a few scripts which provide gzip-like
|
||||
command line interface and a couple of other XZ related tools. It also
|
||||
provides:
|
||||
- Average compression ratio 30% better than that of gzip and 15% better than
|
||||
that of bzip2.
|
||||
- Decompression speed is only little slower than that of gzip, being two to
|
||||
five times faster than bzip2.
|
||||
- In fast mode, compresses faster than bzip2 with a comparable compression
|
||||
ratio.
|
||||
- Achieving the best compression ratios takes four to even twelve times longer
|
||||
than with bzip2. However. this doesn't affect decompressing speed.
|
||||
- Very similar command line interface than what gzip and bzip2 have.
|
||||
|
||||
%files -f %{name}.lang
|
||||
|
|
@ -54,13 +52,14 @@ tools. Also provides:
|
|||
%package -n %{libname}
|
||||
Summary: Libraries for decoding XZ/LZMA compression
|
||||
Group: System/Libraries
|
||||
# compat with Fedora/RH
|
||||
# Compat with Fedora/RH
|
||||
Provides: xz-libs = %{EVRD}
|
||||
|
||||
%description -n %{libname}
|
||||
Libraries for decoding LZMA compression.
|
||||
Libraries for decoding XZ/LZMA compression.
|
||||
|
||||
%files -n %{libname}
|
||||
%doc COPYING
|
||||
/%{_lib}/liblzma.so.%{major}*
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
|
@ -77,6 +76,7 @@ Provides: %{name}-devel = %{EVRD}
|
|||
Devel libraries & headers for liblzma.
|
||||
|
||||
%files -n %{devname}
|
||||
%doc COPYING
|
||||
%{_includedir}/%{lname}.h
|
||||
%dir %{_includedir}/%{lname}
|
||||
%{_includedir}/%{lname}/*.h
|
||||
|
|
@ -103,11 +103,12 @@ Devel libraries & headers for liblzma.
|
|||
export CONFIGURE_TOP=`pwd`
|
||||
mkdir objs
|
||||
pushd objs
|
||||
CFLAGS="%{optflags} -O3 -funroll-loops" \
|
||||
%configure --enable-static
|
||||
%make
|
||||
CFLAGS="%{optflags} -O3 -funroll-loops" \
|
||||
%configure --enable-static
|
||||
%make
|
||||
popd
|
||||
|
||||
|
||||
%install
|
||||
%makeinstall_std -C objs
|
||||
|
||||
|
|
@ -120,5 +121,6 @@ install -m755 %{SOURCE1} -D %{buildroot}%{_bindir}/xzme
|
|||
|
||||
%find_lang %{name}
|
||||
|
||||
|
||||
%check
|
||||
make check -C objs
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue