- revert user changes

Changed files:
    cvs-nserver.spec -> 1.54

diff --git a/cvs-nserver.spec b/cvs-nserver.spec
index b9629a1b1cd469a9f9a1cc5869f97ce882966744..d746f674489f0cead0de1ab9d9dafc27cd31bdec 100644 (file)
--- a/cvs-nserver.spec
+++ b/cvs-nserver.spec
@@ -107,8 +107,12 @@ Klient CVS.
 Summary:       Concurrent Versions System - common files
 Summary(pl):   Concurrent Versions System - wspólne pliki
 Group:         Development/Version Control
-Requires(pre): user-cvs
-Requires(pre): user-cvsadmin
+Requires(pre): /usr/bin/getgid
+Requires(pre): /bin/id
+Requires(pre): /usr/sbin/groupadd
+Requires(pre): /usr/sbin/useradd
+Requires(postun):      /usr/sbin/userdel
+Requires(postun):      /usr/sbin/group
 Requires(pre): cvs-nserver-client
 Requires(pre): fileutils
 Requires:      cvs-nserver-client
@@ -211,12 +215,60 @@ rm -rf $RPM_BUILD_ROOT
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
 %pre common
+if [ -n "`getgid cvs`" ]; then
+       if [ "`getgid cvs`" != "52" ]; then
+               echo "Error: group cvs doesn't have gid=52. Correct this before installing cvs-nserver." 1>&2
+               exit 1
+       fi
+else
+       echo "Adding group cvs GID=52."
+       /usr/sbin/groupadd -g 52 -r -f cvs
+fi
+if [ -n "`getgid cvsadmin`" ]; then
+       if [ "`getgid cvsadmin`" != "53" ]; then
+               echo "Error: group cvsadmin doesn't have gid=53. Correct this before installing cvs-nserver." 1>&2
+               exit 1
+       fi
+else
+       echo "Adding 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 "Error: user cvs doesn't have uid=52. Correct this before installing cvs-nserver." 1>&2
+               exit 1
+       fi
+else
+       echo "Adding 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 "Error: user cvsadmin doesn't have uid=53. Correct this before installing cvs-nserver." 1>&2
+               exit 1
+       fi
+else
+       echo "Adding 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
 if [ "$1" = 1 ]; then
        echo "Initializing repository..."
        %{_bindir}/cvs -d :local:%{_cvsroot} init
        chown -R cvsadmin.cvsadmin %{_cvsroot}/CVSROOT
 fi
 
+%postun common
+if [ "$1" = "0" ]; then
+       echo "Removing user cvs."
+       /usr/sbin/userdel cvs
+       echo "Removing user cvsadmin."
+       /usr/sbin/userdel cvsadmin
+       echo "Removing group cvs."
+       /usr/sbin/groupdel cvs
+       echo "Removing group cvsadmin."
+       /usr/sbin/groupdel cvsadmin
+fi
+
 %post pserver
 if [ -f /var/lock/subsys/rc-inetd ]; then
         /etc/rc.d/init.d/rc-inetd reload