[rusers] added rpcbind ordering dependencies in service files fixed systemd related mistakes in spec file

[Jan Horak]

commit 0b0478470e8d7a6d7099af9cd4d242b1d1e0d17c
Author: Honza Horák <hhorak at redhat.com>
Date:   Wed Aug 10 16:11:17 2011 +0200

    added rpcbind ordering dependencies in service files
    fixed systemd related mistakes in spec file

 rstatd.service  |    1 +
 rusers.spec     |   16 ++++++++++------
 rusersd.service |    1 +
 3 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/rstatd.service b/rstatd.service
index 42fee8c..dd39bbc 100644
--- a/rstatd.service
+++ b/rstatd.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Remote Machine Performance Metrics Gatherer
 Requires=syslog.target network.target rpcbind.service
+After=rpcbind.service
 
 [Service]
 Type=forking
diff --git a/rusers.spec b/rusers.spec
index 57cfa37..5c01f2d 100644
--- a/rusers.spec
+++ b/rusers.spec
@@ -5,7 +5,7 @@
 Summary: Displays the users logged into machines on the local network
 Name: rusers
 Version: 0.17
-Release: 65%{?dist}
+Release: 66%{?dist}
 License: BSD
 Url: http://rstatd.sourceforge.net/
 Group: System Environment/Daemons
@@ -31,7 +31,6 @@ Patch14: netkit-rusers-0.17-procdiskstats.patch
 Patch15: netkit-rusers-0.17-rusersd-droppriv.patch
 # Oracle explicitly gave permission for this relicensing on August 18, 2010.
 Patch16: netkit-rusers-0.17-new-rpc-license.patch
-Requires: /sbin/chkconfig /etc/init.d
 Buildroot: %{_tmppath}/%{name}-root
 BuildRequires: procps libselinux-devel
 
@@ -124,8 +123,8 @@ mkdir -p ${RPM_BUILD_ROOT}%{_unitdir}
 make INSTALLROOT=${RPM_BUILD_ROOT} install
 make INSTALLROOT=${RPM_BUILD_ROOT} install -C rpc.rstatd
 
-install -m 755 %SOURCE1 ${RPM_BUILD_ROOT}%{_unitdir}/rusersd.service
-install -m 755 %SOURCE3 ${RPM_BUILD_ROOT}%{_unitdir}/rstatd.service
+install %SOURCE1 ${RPM_BUILD_ROOT}%{_unitdir}/rusersd.service
+install %SOURCE3 ${RPM_BUILD_ROOT}%{_unitdir}/rstatd.service
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -136,7 +135,8 @@ if [ $1 -eq 1 ] ; then
     /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 fi
 
-%triggerun -- %{name} < 0.17-64
+%triggerun -- rusers-server < 0.17-64
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
 # Save the current service runlevel info
 # User must manually run systemd-sysv-convert --apply httpd
 # to migrate them to systemd targets
@@ -153,7 +153,7 @@ if [ $1 = 0 ]; then
     /bin/systemctl stop rstatd.service rusersd.service > /dev/null 2>&1 || :
 fi
 
-%postun
+%postun server
 /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 if [ $1 -ge 1 ] ; then
     # Package upgrade, not uninstall
@@ -176,6 +176,10 @@ fi
 %{_unitdir}/rstatd.service
 
 %changelog
+* Wed Aug 02 2011 Honza Horak <hhorak at redhat.com> - 0.17-66
+- added rpcbind ordering dependencies in service files
+- fixed systemd related mistakes in spec file
+
 * Tue Aug 02 2011 Honza Horak <hhorak at redhat.com> - 0.17-65
 - added rpcbind requirments to service files
 
diff --git a/rusersd.service b/rusersd.service
index 057eb12..bc44975 100644
--- a/rusersd.service
+++ b/rusersd.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Remote Machine Logged In User Identfier 
 Requires=syslog.target network.target rpcbind.service
+After=rpcbind.service
 
 [Service]
 Type=forking