From ae9da60511cacfc74fee1f1d1b498315151f8315 Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@fedoraproject.org>
Date: Oct 01 2004 09:14:13 +0000
Subject: - Incorporate some clean up code from Ulrich Drepper (bz# 134025)

- Fixed the chkconfig number in the rpcgssd, rpcidmapd, and rpcsvcgssd
    initscrpts (bz# 132284)

---

diff --git a/nfs-utils.spec b/nfs-utils.spec
index b6d049a..006ab88 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -1,7 +1,7 @@
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
 Version: 1.0.6
-Release: 35
+Release: 36
 
 # group all 32bit related archs
 %define all_32bit_archs i386 i686 athlon
@@ -41,6 +41,7 @@ Patch35: nfs-utils-1.0.6-update_idmap.patch
 
 Patch40: nfs-utils-1.0.6-add_gssd.patch
 Patch45: nfs-utils-1.0.6-update_gssd.patch
+Patch46: nfs-utils-1.0.6-fd-sig-cleanup.patch
 
 Patch50: nfs-utils-1.0.6-compile.patch
 Patch100: nfs-utils-1.0.6-pie.patch
@@ -113,6 +114,8 @@ mv libevent-%{eventvers} support/event
 # local updates
 %patch45 -p1 -b .update_gssd
 
+%patch46 -p1 -b .cleanup
+
 # Do the magic to get things to compile
 %patch50 -p1 -b .compile
 %patch100 -p1 -b .pie
@@ -260,6 +263,11 @@ fi
 %config /etc/rc.d/init.d/nfslock
 
 %changelog
+* Fri Oct  1 2004 <SteveD@RedHat.com
+- Incorporate some clean up code from Ulrich Drepper (bz# 134025)
+- Fixed the chkconfig number in the rpcgssd, rpcidmapd, and 
+  rpcsvcgssd initscrpts (bz# 132284)
+
 * Fri Sep 24 2004 <SteveD@RedHat.com>
 - Make sure the uid/gid of nfsnobody is the
   correct value for all archs (bz# 123900)
diff --git a/rpcgssd.init b/rpcgssd.init
index 0216e70..9430d1a 100755
--- a/rpcgssd.init
+++ b/rpcgssd.init
@@ -4,7 +4,7 @@
 #
 # Authors:	Chuck Lever <cel@netapp.com>
 #
-# chkconfig: 0356 18 68
+# chkconfig: 345 18 68
 # description: Starts user-level daemon that manages RPCSEC GSS contexts \
 #	       for the NFSv4 client.
 
diff --git a/rpcidmapd.init b/rpcidmapd.init
index ce3c2d2..1827e87 100755
--- a/rpcidmapd.init
+++ b/rpcidmapd.init
@@ -4,7 +4,7 @@
 #
 # Authors:	Chuck Lever <cel@netapp.com>
 #
-# chkconfig: 0356 19 69
+# chkconfig: 345 19 69
 # description: Starts user-level daemon for NFSv4 that maps user \
 #              names to UID and GID numbers.
 
diff --git a/rpcsvcgssd.init b/rpcsvcgssd.init
index fe0b9f9..7bde919 100755
--- a/rpcsvcgssd.init
+++ b/rpcsvcgssd.init
@@ -4,7 +4,7 @@
 #
 # Authors:	Chuck Lever <cel@netapp.com>
 #
-# chkconfig: 0356 19 69
+# chkconfig: 345 19 69
 # description: Starts user-level daemon that manages RPCSEC GSS contexts \
 #	       for the NFSv4 server.