- revert user changes

Changed files:
    heartbeat.spec -> 1.34

diff --git a/heartbeat.spec b/heartbeat.spec
index fb91e9da994570d10dfd91c12a6737a004702fa6..7c5bc4a8697a79b92f0a9241937398a6085e86c3 100644 (file)
--- a/heartbeat.spec
+++ b/heartbeat.spec
@@ -19,7 +19,9 @@ URL:          http://linux-ha.org/
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 BuildRequires: links
 Requires(pre): /sbin/chkconfig
-Requires(pre): user-haclient
+Requires(pre): /usr/bin/getgid
+Requires(pre): /usr/sbin/groupadd
+Requires(post):        /usr/sbin/groupdel
 Requires:      syslogdaemon
 
 %description
@@ -87,6 +89,16 @@ rm -f doc/{*.html,*.8,COPYING,Makefile*}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+if [ -n "`/usr/bin/getgid haclient`" ]; then
+       if [ "`/usr/bin/getgid haclient`" != "60" ]; then
+               echo "Error: group haclient doesn't have gid=60. Correct this before installing heartbeat." 1>&2
+               exit 1
+       fi
+else
+       /usr/sbin/groupadd -g 60 -r haclient
+fi
+
 %post
 /sbin/chkconfig --add heartbeat
 
@@ -109,6 +121,11 @@ if [ "$1" = "0" ]; then
        fi
 fi
 
+%postun
+if [ "$1" = "0" ]; then
+       /usr/sbin/groupdel haclient 2>/dev/null
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc doc/*