[nfs-utils/f16] Reworked how the nfsd service requires the rpcbind service (bz 768550)

[Steve Dickson]

commit 42462a8b98b03ed6b348c262c29b361479296ec8
Author: Steve Dickson <steved at redhat.com>
Date:   Mon Jan 16 15:36:21 2012 -0500

    Reworked how the nfsd service requires the rpcbind service (bz 768550)
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

 nfs-lock.service   |    3 ++-
 nfs-server.service |    2 +-
 nfs-utils.spec     |    5 ++++-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/nfs-lock.service b/nfs-lock.service
index 19efd5f..c1e1708 100644
--- a/nfs-lock.service
+++ b/nfs-lock.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=NFS file locking service.
-After=syslog.target network.target rpcbind.service
+Requires=rpcbind.service network.target
+After=network.target named.service rpcbind.service
 
 [Service]
 Type=forking
diff --git a/nfs-server.service b/nfs-server.service
index fe88585..03bda17 100644
--- a/nfs-server.service
+++ b/nfs-server.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=NFS Server
-Requires=proc-fs-nfsd.mount
+Requires=proc-fs-nfsd.mount rpcbind.service
 After=syslog.target network.target rpcbind.service proc-fs-nfsd.mount
 
 [Service]
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 555f25a..7af04da 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.2.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -273,6 +273,9 @@ fi
 %attr(4755,root,root)   /sbin/umount.nfs4
 
 %changelog
+* Mon Jan 16 2011 Steve Dickson <steved at redhat.com> 1.2.5-4
+- Reworked how the nfsd service requires the rpcbind service (bz 768550)
+
 * Mon Nov 14 2011 Steve Dickson <steved at redhat.com> 1.2.5-3
 - Ensured nfs-idmap service is started after the DNS is up (bz 748275)
 - Update to upstream RC release: nfs-utils-1.2.6-rc3 (bz 746497)