From 439897d4d8af4dc1e7c4cbd1fc8c119629126a41431ef75fa0c30ab46daa86ef Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Sun, 20 May 2007 19:30:14 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/gzip?expand=0&rev=6

---
 futimens.diff | 38 ++++++++++++++++++++++++++++++++++++++
 gzip.changes  |  5 +++++
 gzip.spec     |  6 +++++-
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 futimens.diff

diff --git a/futimens.diff b/futimens.diff
new file mode 100644
index 0000000..5304448
--- /dev/null
+++ b/futimens.diff
@@ -0,0 +1,38 @@
+--- gzip.c
++++ gzip.c
+@@ -1639,7 +1639,7 @@
+ 	}
+       }
+ 
+-    if (futimens (ofd, ofname, timespec) != 0)
++    if (gl_futimens (ofd, ofname, timespec) != 0)
+       {
+ 	int e = errno;
+ 	WARN ((stderr, "%s: ", program_name));
+--- lib/utimens.c
++++ lib/utimens.c
+@@ -75,8 +75,8 @@
+    Return 0 on success, -1 (setting errno) on failure.  */
+ 
+ int
+-futimens (int fd ATTRIBUTE_UNUSED,
+-	  char const *file, struct timespec const timespec[2])
++gl_futimens (int fd ATTRIBUTE_UNUSED,
++	     char const *file, struct timespec const timespec[2])
+ {
+   /* Some Linux-based NFS clients are buggy, and mishandle time stamps
+      of files in NFS file systems in some cases.  We have no
+@@ -185,5 +185,5 @@
+ int
+ utimens (char const *file, struct timespec const timespec[2])
+ {
+-  return futimens (-1, file, timespec);
++  return gl_futimens (-1, file, timespec);
+ }
+--- lib/utimens.h
++++ lib/utimens.h
+@@ -1,3 +1,3 @@
+ #include <time.h>
+-int futimens (int, char const *, struct timespec const [2]);
++int gl_futimens (int, char const *, struct timespec const [2]);
+ int utimens (char const *, struct timespec const [2]);
diff --git a/gzip.changes b/gzip.changes
index 1571b5e..493d689 100644
--- a/gzip.changes
+++ b/gzip.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun May 20 19:17:21 CEST 2007 - schwab@suse.de
+
+- Fix compiling with glibc 2.6.
+
 -------------------------------------------------------------------
 Sun Apr 15 00:03:31 CEST 2007 - schwab@suse.de
 
diff --git a/gzip.spec b/gzip.spec
index a6c1d96..1bfb5bf 100644
--- a/gzip.spec
+++ b/gzip.spec
@@ -17,7 +17,7 @@ Group:          Productivity/Archiving/Compression
 Autoreqprov:    on
 PreReq:         %{install_info_prereq}
 Version:        1.3.12
-Release:        1
+Release:        9
 Summary:        GNU Zip Compression Utilities
 Source:         %{name}-%{version}.tar.gz
 Patch:          zgrep.diff
@@ -25,6 +25,7 @@ Patch1:         tempfile.diff
 Patch2:         zmore.diff
 Patch3:         non-exec-stack.diff
 Patch4:         http://rsync.samba.org/ftp/unpacked/rsync/patches/gzip-rsyncable.diff
+Patch5:         futimens.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -46,6 +47,7 @@ Authors:
 %patch2
 %patch3
 %patch4 -p1
+%patch5
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fomit-frame-pointer \
@@ -105,6 +107,8 @@ ln -sf zmore.1 $RPM_BUILD_ROOT%{_mandir}/man1/zless.1
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
 
 %changelog
+* Sun May 20 2007 - schwab@suse.de
+- Fix compiling with glibc 2.6.
 * Sun Apr 15 2007 - schwab@suse.de
 - Update to gzip 1.3.12.
   * znew now uses $TMPDIR (default /tmp) instead of always using /tmp.