diff --git a/.cvsignore b/.cvsignore index 4ff9940..8bd8d41 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gzip-1.3.3.tar.gz +gzip-1.3.5.tar.gz diff --git a/gzip-1.3.5-zforce.patch b/gzip-1.3.5-zforce.patch new file mode 100644 index 0000000..12488b0 --- /dev/null +++ b/gzip-1.3.5-zforce.patch @@ -0,0 +1,11 @@ +--- gzip-1.2.4/zforce.in.sopwith Thu Feb 3 18:06:30 2000 ++++ gzip-1.2.4/zforce.in Thu Feb 3 18:07:37 2000 +@@ -25,7 +25,7 @@ + test `expr "$i" : '.*[.-]gz$'` -eq 0 || continue + test `expr "$i" : '.*[.]t[ag]z$'` -eq 0 || continue + +- if gzip -lv < "$i" 2>/dev/null | grep '^defl' > /dev/null; then ++ if gzip -l < "$i" 2>/dev/null | grep '^compressed' > /dev/null; then + + if test `expr "$i" : '^............'` -eq 12; then + new=`expr "$i" : '\(.*\)...$`.gz diff --git a/gzip.spec b/gzip.spec index 71256ea..0094edd 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,18 +1,18 @@ Summary: The GNU data compression program. Name: gzip -Version: 1.3.3 -Release: 16 +Version: 1.3.5 +Release: 1 License: GPL Group: Applications/File Source: ftp://alpha.gnu.org/gnu/gzip/gzip-%{version}.tar.gz -Patch0: gzip-1.3-openbsd-owl-tmp.diff -Patch1: gzip-1.2.4-zforce.patch -Patch2: gzip-1.2.4a-dirinfo.patch -Patch3: gzip-1.3-stderr.patch +Patch0: gzip-1.3.5-openbsd-owl-tmp.patch +Patch1: gzip-1.3.5-zforce.patch +Patch3: gzip-1.3.5-stderr.patch Patch4: gzip-1.3.1-zgreppipe.patch Patch5: gzip-1.3-rsync.patch Patch6: gzip-1.3.3-window-size.patch Patch7: gzip-1.3.3-addsuffix.patch +Patch8: gzip-1.3.5-zgrep-sed.patch URL: http://www.gzip.org/ Prereq: /sbin/install-info Requires: mktemp less @@ -27,14 +27,14 @@ very commonly used data compression program. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -#patch2 -p1 -%patch3 -p1 +%patch0 -p1 -b .owl-tmp +%patch1 -p1 -b .zforce +%patch3 -p1 -b .stderr %patch4 -p1 -b .nixi %patch5 -p1 -b .rsync %patch6 -p1 -b .window-size %patch7 -p1 -b .addsuffix +%patch8 -p0 -b .sed %build export DEFS="-DNO_ASM" @@ -57,13 +57,6 @@ done gzip -9nf ${RPM_BUILD_ROOT}%{_infodir}/gzip.info* - -cat > ${RPM_BUILD_ROOT}%{_bindir}/zless < 1.3.5-1 +- upstream 1.3.5 +- dropped long ago obsolete dirinfo patch +- escape file names in zgrep (#123012) + * Fri Mar 04 2005 Jiri Ryska - rebuilt diff --git a/sources b/sources index c6136bd..9d511fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -52eaf713673507d21f7abefee98ba662 gzip-1.3.3.tar.gz +3d6c191dfd2bf307014b421c12dc8469 gzip-1.3.5.tar.gz