control pserverd with cvs_pserverd* variables and do not start it by default

cvs/cvs.spec

@@ -38,7 +38,7 @@ Class:        CORE
 Group:        SCM
 License:      GPL
 Version:      %{V_cvs}
-Release:      20040920
+Release:      20041016
 
 #   package options
 %option       with_fsl         yes

cvs/rc.cvs

@@ -5,9 +5,10 @@
 
 %config
     cvs_enable="$openpkg_rc_def"
-    cvs_gflags=""
-    cvs_lflags=""
-    cvs_listen="127.0.0.1:2401"
+    cvs_daemon="no"
+    cvs_daemon_gflags=""
+    cvs_daemon_lflags=""
+    cvs_daemon_listen="127.0.0.1:2401"
     cvs_log_prolog="true"
     cvs_log_epilog="true"
     cvs_log_numfiles="10"
@@ -15,16 +16,16 @@
     cvs_log_complevel="9"
 
 %common
-    cvs_pserverd_pidfile="@l_prefix@/var/cvs/pserverd.pid"
-    cvs_pserverd_signal () {
-        [ -f $cvs_pserverd_pidfile ] && kill -$1 `cat $cvs_pserverd_pidfile`
+    cvs_daemon_pidfile="@l_prefix@/var/cvs/cvs.pid"
+    cvs_daemon_signal () {
+        [ -f $cvs_daemon_pidfile ] && kill -$1 `cat $cvs_daemon_pidfile`
     }
 
 %status -u @l_susr@ -o
     cvs_usable="unknown"
     cvs_active="no"
-    rcService cvs enable yes && \
-        cvs_pserverd_signal 0 && cvs_active="yes"
+    rcService cvs enable yes && rcVarIsYes cvs_daemon && \
+        cvs_daemon_signal 0 && cvs_active="yes"
     echo "cvs_enable=\"$cvs_enable\""
     echo "cvs_usable=\"$cvs_usable\""
     echo "cvs_active=\"$cvs_active\""
@@ -32,17 +33,21 @@
 %start -u @l_susr@
     rcService cvs enable yes || exit 0
     rcService cvs active yes && exit 0
-    @l_prefix@/bin/cvs --version | grep RSE >/dev/null || exit 0
-    @l_prefix@/bin/cvs -f $cvs_gflags \
-        pserverd -d -p $cvs_pserverd_pidfile \
-        -l $cvs_listen $cvs_lflags
+    if rcVarIsYes cvs_daemon; then
+        @l_prefix@/bin/cvs --version | grep RSE >/dev/null || exit 0
+        @l_prefix@/bin/cvs -f $cvs_daemon_gflags \
+            pserverd -d -p $cvs_daemon_pidfile \
+            -l $cvs_daemon_listen $cvs_daemon_lflags
+    fi
 
 %stop -u @l_susr@
     rcService cvs enable yes || exit 0
     rcService cvs active no  && exit 0
-    @l_prefix@/bin/cvs --version | grep RSE >/dev/null || exit 0
-    cvs_pserverd_signal TERM
-    rm -f $cvs_pserverd_pidfile 2>/dev/null || true
+    if rcVarIsYes cvs_daemon; then
+        @l_prefix@/bin/cvs --version | grep RSE >/dev/null || exit 0
+        cvs_daemon_signal TERM
+        rm -f $cvs_daemon_pidfile 2>/dev/null || true
+    fi
 
 %restart -u @l_susr@
     rcService cvs enable yes || exit 0