- upstream 1.3.5

- dropped long ago obsolete dirinfo patch
- escape file names in zgrep (#123012)
This commit is contained in:
Tomáš Mráz 2005-03-22 08:59:15 +00:00
parent 0e3a5dd021
commit 8daeb8ef78
4 changed files with 28 additions and 19 deletions

View File

@ -1 +1 @@
gzip-1.3.3.tar.gz gzip-1.3.5.tar.gz

11
gzip-1.3.5-zforce.patch Normal file
View File

@ -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

View File

@ -1,18 +1,18 @@
Summary: The GNU data compression program. Summary: The GNU data compression program.
Name: gzip Name: gzip
Version: 1.3.3 Version: 1.3.5
Release: 16 Release: 1
License: GPL License: GPL
Group: Applications/File Group: Applications/File
Source: ftp://alpha.gnu.org/gnu/gzip/gzip-%{version}.tar.gz Source: ftp://alpha.gnu.org/gnu/gzip/gzip-%{version}.tar.gz
Patch0: gzip-1.3-openbsd-owl-tmp.diff Patch0: gzip-1.3.5-openbsd-owl-tmp.patch
Patch1: gzip-1.2.4-zforce.patch Patch1: gzip-1.3.5-zforce.patch
Patch2: gzip-1.2.4a-dirinfo.patch Patch3: gzip-1.3.5-stderr.patch
Patch3: gzip-1.3-stderr.patch
Patch4: gzip-1.3.1-zgreppipe.patch Patch4: gzip-1.3.1-zgreppipe.patch
Patch5: gzip-1.3-rsync.patch Patch5: gzip-1.3-rsync.patch
Patch6: gzip-1.3.3-window-size.patch Patch6: gzip-1.3.3-window-size.patch
Patch7: gzip-1.3.3-addsuffix.patch Patch7: gzip-1.3.3-addsuffix.patch
Patch8: gzip-1.3.5-zgrep-sed.patch
URL: http://www.gzip.org/ URL: http://www.gzip.org/
Prereq: /sbin/install-info Prereq: /sbin/install-info
Requires: mktemp less Requires: mktemp less
@ -27,14 +27,14 @@ very commonly used data compression program.
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch0 -p1 -b .owl-tmp
%patch1 -p1 %patch1 -p1 -b .zforce
#patch2 -p1 %patch3 -p1 -b .stderr
%patch3 -p1
%patch4 -p1 -b .nixi %patch4 -p1 -b .nixi
%patch5 -p1 -b .rsync %patch5 -p1 -b .rsync
%patch6 -p1 -b .window-size %patch6 -p1 -b .window-size
%patch7 -p1 -b .addsuffix %patch7 -p1 -b .addsuffix
%patch8 -p0 -b .sed
%build %build
export DEFS="-DNO_ASM" export DEFS="-DNO_ASM"
@ -57,13 +57,6 @@ done
gzip -9nf ${RPM_BUILD_ROOT}%{_infodir}/gzip.info* gzip -9nf ${RPM_BUILD_ROOT}%{_infodir}/gzip.info*
cat > ${RPM_BUILD_ROOT}%{_bindir}/zless <<EOF
#!/bin/sh
/bin/zcat "\$@" | /usr/bin/less
EOF
chmod 755 ${RPM_BUILD_ROOT}%{_bindir}/zless
# we don't ship it, so let's remove it from ${RPM_BUILD_ROOT} # we don't ship it, so let's remove it from ${RPM_BUILD_ROOT}
rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
@ -87,6 +80,11 @@ fi
%{_infodir}/gzip.info* %{_infodir}/gzip.info*
%changelog %changelog
* Tue Mar 22 2005 Tomas Mraz <tmraz@redhat.com> 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 <jryska@redhat.com> * Fri Mar 04 2005 Jiri Ryska <jryska@redhat.com>
- rebuilt - rebuilt

View File

@ -1 +1 @@
52eaf713673507d21f7abefee98ba662 gzip-1.3.3.tar.gz 3d6c191dfd2bf307014b421c12dc8469 gzip-1.3.5.tar.gz