- changed useradd option: s/-m/-M/

- moved fix-info-dir to post/postun of base package

Changed files:
    cvs.spec -> 1.55

diff --git a/cvs.spec b/cvs.spec
index f61c87060a7abb4693b7299e21d048e914ffed30..203f797025bbfaac6cbbe2842d24a04f3ed09f32 100644 (file)
--- a/cvs.spec
+++ b/cvs.spec
@@ -131,11 +131,17 @@ gzip -9nf doc/*.ps BUGS FAQ MINOR-BUGS NEWS PROJECTS TODO README ChangeLog \
 
 rm -f contrib/{.cvsignore,Makefile*,*.pl,*.sh,*.csh}
 
+%post
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+
+%postun
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+
 %pre pserver
 if [ "$1" = 1 ]; then
        # Add user and group
        getgid cvs >/dev/null 2>&1 || %{_sbindir}/groupadd -f -g 52 cvs
-       id -u cvs >/dev/null 2>&1 || %{_sbindir}/useradd -g cvs -m -d /home/cvsroot -u 52 -s /bin/false cvs 2>/dev/null
+       id -u cvs >/dev/null 2>&1 || %{_sbindir}/useradd -g cvs -M -d /home/cvsroot -u 52 -s /bin/false cvs 2>/dev/null
 fi
 
 %post pserver
@@ -147,7 +153,6 @@ fi
 if [ -f /var/lock/subsys/rc-inetd ]; then
        /etc/rc.d/init.d/rc-inetd reload
 fi
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
 %postun pserver
 if [ "$1" = "0" ]; then
@@ -158,7 +163,6 @@ if [ "$1" = "0" ]; then
                /etc/rc.d/init.d/rc-inetd reload
        fi
 fi
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
 %clean
 rm -rf $RPM_BUILD_ROOT