From f845519771952d6eed0b1c30b654bf7f896320be Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@fedoraproject.org>
Date: Aug 13 2007 15:21:04 +0000
Subject: removed nfs-utils-1.0.6-idmap.conf.patch since is no longer needed.


---

diff --git a/nfs-utils-1.0.6-idmap.conf.patch b/nfs-utils-1.0.6-idmap.conf.patch
deleted file mode 100644
index 3b668cb..0000000
--- a/nfs-utils-1.0.6-idmap.conf.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- nfs-utils-1.0.6/utils/idmapd/idmapd.conf.orig	2004-11-03 12:49:06.363552000 -0500
-+++ nfs-utils-1.0.6/utils/idmapd/idmapd.conf	2004-11-03 12:49:40.573380000 -0500
-@@ -8,3 +8,6 @@
- 
- Nobody-User = nobody
- Nobody-Group = nobody
-+
-+[Translation]
-+Method = nsswitch
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 9063830..c849986 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -24,15 +24,14 @@ Source15: nfs.sysconfig
 
 Patch00: nfs-utils-1.0.5-statdpath.patch
 Patch01: nfs-utils-1.0.6-mountd.patch
-Patch02: nfs-utils-1.0.6-idmap.conf.patch
-Patch03: nfs-utils-1.0.6-gssd_mixed_case.patch
-Patch04: nfs-utils-1.0.12-mountd-memleak.patch
-Patch05: nfs-utils-1.0.12-nfsd-macargs.patch
-Patch06: nfs-utils-1.0.12-mtab-mis-unlock.patch
-Patch07: nfs-utils-1.1.0-exp-subtree-warn-off.patch
-Patch08: nfs-utils-1.1.0-showmount-rpcerror.patch
-Patch09: nfs-utils-1.1.0-mount-v4-errors.patch
-Patch10: nfs-utils-1.1.0-mount-nosharecache.patch
+Patch02: nfs-utils-1.0.6-gssd_mixed_case.patch
+Patch03: nfs-utils-1.0.12-mountd-memleak.patch
+Patch04: nfs-utils-1.0.12-nfsd-macargs.patch
+Patch05: nfs-utils-1.0.12-mtab-mis-unlock.patch
+Patch06: nfs-utils-1.1.0-exp-subtree-warn-off.patch
+Patch07: nfs-utils-1.1.0-showmount-rpcerror.patch
+Patch08: nfs-utils-1.1.0-mount-v4-errors.patch
+Patch09: nfs-utils-1.1.0-mount-nosharecache.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.1.0-mount-fsc.patch
@@ -95,7 +94,6 @@ This package also contains the mount.nfs and umount.nfs program.
 %patch07 -p1
 %patch08 -p1
 %patch09 -p1
-%patch10 -p1
 
 %if %{enablefscache}
 %patch90 -p1
@@ -141,9 +139,6 @@ install -m 755 %{SOURCE13} $RPM_BUILD_ROOT/etc/rc.d/init.d/rpcgssd
 install -m 755 %{SOURCE14} $RPM_BUILD_ROOT/etc/rc.d/init.d/rpcsvcgssd
 install -m 644 %{SOURCE15} $RPM_BUILD_ROOT/etc/sysconfig/nfs
 
-#install -m 644 utils/idmapd/idmapd.conf \
-#    $RPM_BUILD_ROOT/etc/idmapd.conf
-
 mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/rpc_pipefs
 
 touch $RPM_BUILD_ROOT/var/lib/nfs/rmtab
@@ -236,7 +231,6 @@ fi
 %config /etc/rc.d/init.d/rpcgssd
 %config /etc/rc.d/init.d/rpcsvcgssd
 %config(noreplace) /etc/sysconfig/nfs
-#%config(noreplace) /etc/idmapd.conf
 %dir /var/lib/nfs/v4recovery
 %dir /var/lib/nfs/rpc_pipefs
 %dir /var/lib/nfs
@@ -273,6 +267,7 @@ fi
 * Mon Aug 13 2007 Steve Dickson <steved@redhat.com>  1.1.0-3
 - Added nosharecache mount option which re-enables
   rw/ro mounts to the same server (bz 243913).
+- Removed patch and rules that installes /etc/idmapd.conf
 
 * Thu Aug  2 2007 Steve Dickson <steved@redhat.com>  1.1.0-2
 - Make sure the initscript exits if rpc.mountd does