From abd5008105115eabbf4a8f5890a1bcf1df812ef0 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 7 Jul 2013 10:43:03 +0200 Subject: [PATCH] gzip: Update to 1.6. --- gzip/gzip.nm | 5 ++++- gzip/patches/gzip-1.3.5-zforce.patch | 2 +- gzip/patches/gzip-1.3.9-addsuffix.patch | 19 ------------------- 3 files changed, 5 insertions(+), 21 deletions(-) delete mode 100644 gzip/patches/gzip-1.3.9-addsuffix.patch diff --git a/gzip/gzip.nm b/gzip/gzip.nm index 020e9d798..20c389b09 100644 --- a/gzip/gzip.nm +++ b/gzip/gzip.nm @@ -4,7 +4,7 @@ ############################################################################### name = gzip -version = 1.5 +version = 1.6 release = 1 groups = Applications/Compression @@ -23,6 +23,9 @@ build requires coreutils less + texinfo + + /usr/bin/more end # NO_ASM is for textrels. diff --git a/gzip/patches/gzip-1.3.5-zforce.patch b/gzip/patches/gzip-1.3.5-zforce.patch index 5a9beca1f..b13c76644 100644 --- a/gzip/patches/gzip-1.3.5-zforce.patch +++ b/gzip/patches/gzip-1.3.5-zforce.patch @@ -6,7 +6,7 @@ diff -up gzip-1.3.12/zforce.in.zforce gzip-1.3.12/zforce.in fi - 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 gzip -l < "$i" 2>/dev/null | grep 'compressed' > /dev/null; then new="$i.gz" if mv "$i" "$new"; then diff --git a/gzip/patches/gzip-1.3.9-addsuffix.patch b/gzip/patches/gzip-1.3.9-addsuffix.patch deleted file mode 100644 index 80a823de8..000000000 --- a/gzip/patches/gzip-1.3.9-addsuffix.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- gzip-1.3.9/zmore.in.pom 2007-01-15 15:31:26.000000000 +0100 -+++ gzip-1.3.9/zmore.in 2007-01-15 15:34:06.000000000 +0100 -@@ -70,7 +70,7 @@ - --v*) exec echo "$version";; - esac - -- < "$FILE" || continue -+ if test -e $FILE || test -e $FILE.gz; then - if test $FIRST -eq 0; then - echo $n1 "--More--(Next file: $FILE)$n2" - stty $cb -echo 2>/dev/null -@@ -88,5 +88,7 @@ - if test -t 1; then - FIRST=0 - fi -+ else < $FILE -+ fi - done - fi -- 2.47.3