- finally in /var/lib/cvs

- example for /srv in cvs.inetd (as comment)

Changed files:
    cvs.inetd -> 1.6
    cvs.spec -> 1.126

diff --git a/cvs.inetd b/cvs.inetd
index 46b26971dc31becdbb3175981c7c265511339f35..bcba5b1ffc7e33356ea8406e921bdbf85567d0c0 100644 (file)
--- a/cvs.inetd
+++ b/cvs.inetd
@@ -7,4 +7,6 @@ USER=cvs
 GROUP=cvs
 SERVER=tcpd
 DAEMON=/usr/bin/cvs
-DAEMONARGS="-f --allow-root=/home/services/cvsroot pserver"
+DAEMONARGS="-f --allow-root=/var/lib/cvsroot pserver"
+# Example for /srv
+#DAEMONARGS="-f --allow-root=/srv/cvs pserver"

diff --git a/cvs.spec b/cvs.spec
index a05d533ffa0c3fdf55d6b443b214bc5046b64eb8..375519f3b151596d3069a3e7fffdeecfd7b93db1 100644 (file)
--- a/cvs.spec
+++ b/cvs.spec
@@ -39,7 +39,7 @@ BuildRequires:        zlib-devel
 Obsoletes:     cvs-nserver-client
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _cvs_root       /home/services/cvsroot
+%define                _cvs_root       /var/lib/cvs
 
 %description
 CVS means Concurrent Version System; it is a version control system
@@ -276,6 +276,10 @@ if [ "$1" = "0" ]; then
        fi
 fi
 
+%triggerpostun -- phpMyAdmin < 1.1.13-1
+echo "Warning: default cvsroot moved to /var/lib/cvsroot."
+echo "Check your configration."
+
 %files
 %defattr(644,root,root,755)
 %doc BUGS FAQ MINOR-BUGS NEWS PROJECTS TODO README ChangeLog doc/*.ps contrib