From 3e42301dae744ee0324d706d9c70915807633061 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 09:26:46 +0000
Subject: [PATCH] auto-import changelog data from nfs-utils-1.0.6-31.src.rpm
 Tue Aug 10 2004 Bill Nottingham <notting@redhat.com> - move if..fi
 condrestart stanza to %postun (#127914, #128601)

---
 nfs-utils.spec | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/nfs-utils.spec b/nfs-utils.spec
index 29e77ff..c38f6d8 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -15,7 +15,7 @@
 Summary: NFS utlilities and supporting daemons for the kernel NFS server.
 Name: nfs-utils
 Version: 1.0.6
-%define release 30
+%define release 31
 
 %define Release %{release}
 %if %{rhel3build}
@@ -175,22 +175,13 @@ if [ "$?" -eq 1 ]; then
 fi
 
 %post
-if [ "$1" -ge 1 ]; then
+/sbin/chkconfig --add nfs
+/sbin/chkconfig --add nfslock
 %if %{nfsv4_support}
-	/etc/rc.d/init.d/rpcidmapd condrestart > /dev/null
-	/etc/rc.d/init.d/rpcgssd condrestart > /dev/null
-	/etc/rc.d/init.d/rpcsvcgssd condrestart > /dev/null
+/sbin/chkconfig --add rpcidmapd
+/sbin/chkconfig --add rpcgssd
+/sbin/chkconfig --add rpcsvcgssd
 %endif
-	/etc/rc.d/init.d/nfs condrestart > /dev/null
-else 
-	/sbin/chkconfig --add nfs
-	/sbin/chkconfig --add nfslock
-%if %{nfsv4_support}
-	/sbin/chkconfig --add rpcidmapd
-	/sbin/chkconfig --add rpcgssd
-	/sbin/chkconfig --add rpcsvcgssd
-%endif
-fi
 
 %preun
 if [ "$1" = "0" ]; then
@@ -212,6 +203,15 @@ if [ "$1" = "0" ]; then
 %endif
 fi
 
+%postun
+if [ "$1" -ge 1 ]; then
+%if %{nfsv4_support}
+	/etc/rc.d/init.d/rpcidmapd condrestart > /dev/null
+	/etc/rc.d/init.d/rpcgssd condrestart > /dev/null
+	/etc/rc.d/init.d/rpcsvcgssd condrestart > /dev/null
+%endif
+	/etc/rc.d/init.d/nfs condrestart > /dev/null
+fi
 
 %triggerpostun -- nfs-server
 /sbin/chkconfig --add nfs
@@ -258,6 +258,9 @@ fi
 %config /etc/rc.d/init.d/nfslock
 
 %changelog
+* Tue Aug 10 2004 Bill Nottingham <notting@redhat.com>
+- move if..fi condrestart stanza to %%postun (#127914, #128601)
+
 * Wed Jun 16 2004 <SteveD@RedHat.com>
 - nfslock stop is now done on package removals
 - Eliminate 3 syslog messages that are logged for