From 2efacfd98f8072ceedf08a2f1bf1a0ff2567199f Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@fedoraproject.org>
Date: Jan 24 2008 22:14:04 +0000
Subject: - Added in relatime mount option so mount.nfs stays compatible with the

    mount command in util-linux-ng (bz 274301)

---

diff --git a/nfs-utils-1.1.1-mount-relatime.patch b/nfs-utils-1.1.1-mount-relatime.patch
new file mode 100644
index 0000000..382d8d4
--- /dev/null
+++ b/nfs-utils-1.1.1-mount-relatime.patch
@@ -0,0 +1,40 @@
+commit b5651e42cedc2b91aba87ea30520884d7f43b36f
+Author: Steve Dickson <steved@redhat.com>
+Date:   Thu Jan 24 17:02:08 2008 -0500
+
+    Added in relatime mount option so mount.nfs stays
+    compatible with the mount command in util-linux-ng
+    
+    Signed-off-by: Steve Dickson <steved@redhat.com>
+
+diff -up nfs-utils-1.1.1/utils/mount/mount.c.orig nfs-utils-1.1.1/utils/mount/mount.c
+--- nfs-utils-1.1.1/utils/mount/mount.c.orig	2007-10-18 23:07:28.000000000 -0400
++++ nfs-utils-1.1.1/utils/mount/mount.c	2008-01-24 16:46:03.000000000 -0500
+@@ -130,6 +130,12 @@ static const struct opt_map opt_map[] = 
+   { "diratime", 0, 1, MS_NODIRATIME },  /* Update dir access times */
+   { "nodiratime", 0, 0, MS_NODIRATIME },/* Do not update dir access times */
+ #endif
++#ifdef MS_RELATIME
++  { "relatime", 0, 0, MS_RELATIME },   /* Update access times relative to
++                      mtime/ctime */
++  { "norelatime", 0, 1, MS_RELATIME }, /* Update access time without regard
++                      to mtime/ctime */
++#endif
+   { NULL,	0, 0, 0		}
+ };
+ 
+diff -up nfs-utils-1.1.1/utils/mount/mount_constants.h.orig nfs-utils-1.1.1/utils/mount/mount_constants.h
+--- nfs-utils-1.1.1/utils/mount/mount_constants.h.orig	2007-10-18 23:07:28.000000000 -0400
++++ nfs-utils-1.1.1/utils/mount/mount_constants.h	2008-01-24 16:47:07.000000000 -0500
+@@ -39,7 +39,10 @@ if we have a stack or plain mount - moun
+ #ifndef MS_VERBOSE
+ #define MS_VERBOSE	0x8000	/* 32768 */
+ #endif
+-
++#ifndef MS_RELATIME
++#define MS_RELATIME 0x200000 /* 200000: Update access times relative
++                                  to mtime/ctime */
++#endif
+ /*
+  * NFS fs-specific mount option flags
+  *
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 99e1d38..3fdba11 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
 Version: 1.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -43,6 +43,7 @@ Patch102: nfs-utils-1.1.1-mount-rm-nfsprog.patch
 Patch103: nfs-utils-1.1.1-mount-rm-mountprog.patch
 Patch104: nfs-utils-1.1.1-xlog-valist.patch
 Patch105: nfs-utils-1.1.1-mountd-crossmnt.patch
+Patch106: nfs-utils-1.1.1-mount-relatime.patch
 
 Group: System Environment/Daemons
 Provides: exportfs    = %{epoch}:%{version}-%{release}
@@ -110,6 +111,7 @@ This package also contains the mount.nfs and umount.nfs program.
 %patch103 -p1
 %patch104 -p1
 %patch105 -p1
+%patch106 -p1
 
 # Remove .orig files
 find . -name "*.orig" | xargs rm -f
@@ -273,6 +275,10 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Thu Jan 24 2008 Steve Dickson <steved@redhat.com>  1.1.1-3
+- Added in relatime mount option so mount.nfs stays
+  compatible with the mount command in util-linux-ng (bz 274301)
+
 * Tue Jan 22 2008 Steve Dickson <steved@redhat.com>  1.1.1-2
 - Added -S/--since to the nfsstat(1) manpage
 - The wording in the exportfs man page can be a bit confusing, implying