diff --git a/.cvsignore b/.cvsignore index 9e2d86a..850d008 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gzip-1.3.11.tar.gz +gzip-1.3.12.tar.gz diff --git a/gzip-1.3.12-openbsd-owl-tmp.patch b/gzip-1.3.12-openbsd-owl-tmp.patch new file mode 100644 index 0000000..423c667 --- /dev/null +++ b/gzip-1.3.12-openbsd-owl-tmp.patch @@ -0,0 +1,45 @@ +--- gzip-1.3.12/znew.in.owl-tmp 2007-06-04 09:15:11.000000000 +0200 ++++ gzip-1.3.12/znew.in 2007-06-04 09:23:18.000000000 +0200 +@@ -55,28 +55,27 @@ + # block is the disk block size (best guess, need not be exact) + + warn="(does not preserve modes and timestamp)" +-tmp=${TMPDIR-/tmp}/zfoo.$$ +-set -C +-echo hi > $tmp || exit +-if test -z "`(${CPMOD-cpmod} $tmp $tmp) 2>&1`"; then +- cpmod=${CPMOD-cpmod} ++cpmod= ++cpmodarg= ++if type ${CPMOD:-cpmod} 2>/dev/null; then ++ cpmod=${CPMOD:-cpmod} + warn="" + fi + +-if test -z "$cpmod" && ${TOUCH-touch} -r $tmp $tmp 2>/dev/null; then +- cpmod="${TOUCH-touch}" ++if test -z "$cpmod"; then ++ cpmod=touch + cpmodarg="-r" + warn="(does not preserve file modes)" + fi + +-# check if GZIP env. variable uses -S or --suffix +-gzip -q $tmp +-ext=`echo $tmp* | sed "s|$tmp||"` +-rm -f $tmp* +-if test -z "$ext"; then +- echo znew: error determining gzip extension +- exit 1 +-fi ++case "$GZIP" in ++ *-S*) ext=`echo "$GZIP" | sed 's/^.*-S[[:space:]]*\([^[:space:]]*\).*$/\1/'` ++ ;; ++ *-suffix*) ext=`echo "$GZIP" | sed 's/^.*--suffix=\([^[:space:]]*\).*$/\1/'` ++ ;; ++ *) ext='.gz' ++ ;; ++esac + if test "$ext" = ".Z"; then + echo znew: cannot use .Z as gzip extension. + exit 1 diff --git a/gzip-1.3.9-openbsd-owl-tmp.patch b/gzip-1.3.9-openbsd-owl-tmp.patch deleted file mode 100644 index c3f8df0..0000000 --- a/gzip-1.3.9-openbsd-owl-tmp.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- gzip-1.3.9/znew.in.owl-tmp 2006-12-09 05:25:56.000000000 +0100 -+++ gzip-1.3.9/znew.in 2007-01-15 11:40:51.000000000 +0100 -@@ -55,28 +55,27 @@ - # block is the disk block size (best guess, need not be exact) - - warn="(does not preserve modes and timestamp)" --tmp=/tmp/zfoo.$$ --set -C --echo hi > $tmp || exit --if test -z "`(${CPMOD-cpmod} $tmp $tmp) 2>&1`"; then -- cpmod=${CPMOD-cpmod} -+cpmod= -+cpmodarg= -+if type ${CPMOD:-cpmod} 2>/dev/null; then -+ cpmod=${CPMOD:-cpmod} - warn="" - fi - --if test -z "$cpmod" && ${TOUCH-touch} -r $tmp $tmp 2>/dev/null; then -- cpmod="${TOUCH-touch}" -+if test -z "$cpmod"; then -+ cpmod=touch - cpmodarg="-r" - warn="(does not preserve file modes)" - fi - --# check if GZIP env. variable uses -S or --suffix --gzip -q $tmp --ext=`echo $tmp* | sed "s|$tmp||"` --rm -f $tmp* --if test -z "$ext"; then -- echo znew: error determining gzip extension -- exit 1 --fi -+case "$GZIP" in -+ *-S*) ext=`echo "$GZIP" | sed 's/^.*-S[[:space:]]*\([^[:space:]]*\).*$/\1/'` -+ ;; -+ *-suffix*) ext=`echo "$GZIP" | sed 's/^.*--suffix=\([^[:space:]]*\).*$/\1/'` -+ ;; -+ *) ext='.gz' -+ ;; -+esac - if test "$ext" = ".Z"; then - echo znew: cannot use .Z as gzip extension. - exit 1 diff --git a/gzip.spec b/gzip.spec index 532cc6c..d53530c 100644 --- a/gzip.spec +++ b/gzip.spec @@ -1,11 +1,11 @@ Summary: The GNU data compression program Name: gzip -Version: 1.3.11 +Version: 1.3.12 Release: 1%{?dist} License: GPL Group: Applications/File Source: ftp://alpha.gnu.org/gnu/gzip/gzip-%{version}.tar.gz -Patch0: gzip-1.3.9-openbsd-owl-tmp.patch +Patch0: gzip-1.3.12-openbsd-owl-tmp.patch Patch1: gzip-1.3.5-zforce.patch Patch3: gzip-1.3.9-stderr.patch Patch4: gzip-1.3.10-zgreppipe.patch @@ -91,6 +91,9 @@ fi %{_infodir}/gzip.info* %changelog +* Mon Jun 4 2007 Ivana Varekova - 1.3.12-1 +- update to 1.3.12 + * Mon Mar 5 2007 Ivana Varekova - 1.3.11-1 - update to 1.3.11 remove uncompress diff --git a/sources b/sources index e8bdb78..ad4e4be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a41a6a4b11f941cb7fc13df320f3af5f gzip-1.3.11.tar.gz +b5bac2d21840ae077e0217bc5e4845b1 gzip-1.3.12.tar.gz