- reverting last change: removing new macros from %p{re,ost}{,un}

Changed files:
    cvs-nserver.spec -> 1.18

diff --git a/cvs-nserver.spec b/cvs-nserver.spec
index a84e2b839435711d224dfaf0754ca13a75a7dd6d..486a16f45714d447a87193e2c694f20b260203e6 100644 (file)
--- a/cvs-nserver.spec
+++ b/cvs-nserver.spec
@@ -178,13 +178,46 @@ mv        $RPM_BUILD_ROOT%{_datadir}/cvs-nserver/contrib/rcs2log \
 gzip -9nf AUTHORS BUGS NEWS NEWS.nserver PROJECTS TODO
 
 %pre -n cvs-nserver-common
-GROUP=cvs; GID=52; %groupadd
-USER=cvs; UID=52; HOMEDIR=%{_cvsroot}; COMMENT="CVS user"; %useradd
-GROUP=cvsadmin; GID=53; %groupadd
-USER=cvsadmin; UID=53; HOMEDIR=%{_cvsroot}; COMMENT="CVS user"; %useradd
+if [ -n "`getgid cvs`" ]; then
+       if [ "`getgid cvs`" != "52" ]; then
+               echo "Warning: group cvs haven't gid=52. Correct this before installing cvs-nserver" 1>&2
+               exit 1
+       fi
+else
+       echo "Making group cvs GID=52"
+       /usr/sbin/groupadd -g 52 -r -f cvs
+fi
+if [ -n "`getgid cvsadmin`" ]; then
+       if [ "`getgid cvsadmin`" != "53" ]; then
+               echo "Warning: group cvsadmin haven't gid=53. Correct this before installing cvs-nserver" 1>&2
+               exit 1
+       fi
+else
+       echo "Making group cvsadmin GID=53"
+       /usr/sbin/groupadd -g 53 -r -f cvsadmin
+fi
+if [ -n "`id -u cvs 2>/dev/null`" ]; then
+       if [ "`id -u cvs`" != "52" ]; then
+               echo "Warning: user cvs haven't uid=52. Correct this before installing cvs-nserver" 1>&2
+               exit 1
+       fi
+else
+       echo "Making user cvs UID=52"
+       /usr/sbin/useradd -u 52 -r -d %{_cvsroot} -s /bin/false -c "CVS user" -g cvs cvs 1>&2
+fi
+if [ -n "`id -u cvsadmin 2>/dev/null`" ]; then
+       if [ "`id -u cvsadmin`" != "53" ]; then
+               echo "Warning: user cvsadmin haven't uid=53. Correct this before installing cvs-nserver" 1>&2
+               exit 1
+       fi
+else
+       echo "Making user cvsadmin UID=53"
+       /usr/sbin/useradd -u 53 -r -d %{_cvsroot} -s /bin/false -c "CVS user" -g cvsadmin -G cvs cvsadmin 1>&2
+fi
 
 %post -n cvs-nclient
-%fix-info-dir
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+
 
 %post -n cvs-nserver-experimental 
 if [ "$1" = 1 ]; then
@@ -192,7 +225,9 @@ if [ "$1" = 1 ]; then
        %{_bindir}/cvs -d :local:%{_cvsroot} init
        chown -R cvsadmin.cvsadmin %{_cvsroot}/CVSROOT
 fi
-%rc_inetd_post
+if [ -f /var/lock/subsys/rc-inetd ]; then
+        /etc/rc.d/init.d/rc-inetd reload
+fi
 
 %post -n cvs-npserver
 if [ "$1" = 1 ]; then
@@ -200,22 +235,34 @@ if [ "$1" = 1 ]; then
        %{_bindir}/cvs -d :local:%{_cvsroot} init
        chown -R cvsadmin.cvsadmin %{_cvsroot}/CVSROOT
 fi
-%rc_inetd_post
+if [ -f /var/lock/subsys/rc-inetd ]; then
+        /etc/rc.d/init.d/rc-inetd reload
+fi
 
 %postun -n cvs-nserver-common
-USER=cvs; %userdel
-GROUP=cvs; %groupdel
-USER=cvsadmin; %userdel
-GROUP=cvsadmin; %groupdel
+if [ "$1" = "0" ]; then
+       echo "Removing group cvs GID=52"
+       /usr/sbin/userdel cvs
+       echo "Removing group cvsadmin GID=53"
+       /usr/sbin/userdel cvsadmin
+       echo "Removing user cvs UID=52"
+       /usr/sbin/groupdel cvs
+       echo "Removing user cvsadmin UID=53"
+       /usr/sbin/groupdel cvsadmin
+fi
 
 %postun -n cvs-nserver-experimental
-%rc_inetd_postun
+if [ -f /var/lock/subsys/rc-inetd ]; then
+        /etc/rc.d/init.d/rc-inetd reload
+fi
 
 %postun -n cvs-npserver
-%rc_inetd_postun
+if [ -f /var/lock/subsys/rc-inetd ]; then
+        /etc/rc.d/init.d/rc-inetd reload
+fi
 
 %postun -n cvs-nclient
-%fix_info_dir
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
 %clean
 rm -rf $RPM_BUILD_ROOT