OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Michael Schloh
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   04-Aug-2004 13:29:05
  Branch: HEAD                             Handle: 2004080412290400

  Modified files:
    openpkg-src/ucarp       rc.ucarp ucarp.spec

  Log:
    remove unnecessary epilog restart (FSL handles fd close), and tag FSL
    files as config

  Summary:
    Revision    Changes     Path
    1.2         +2  -4      openpkg-src/ucarp/rc.ucarp
    1.2         +4  -2      openpkg-src/ucarp/ucarp.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/ucarp/rc.ucarp
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 rc.ucarp
  --- openpkg-src/ucarp/rc.ucarp        27 Jul 2004 17:26:56 -0000      1.1
  +++ openpkg-src/ucarp/rc.ucarp        4 Aug 2004 11:29:04 -0000       1.2
  @@ -43,9 +43,7 @@
   %restart -u @l_susr@
       rcService ucarp enable yes || exit 0
       rcService ucarp active no && exit 0
  -    rc ucarp stop
  -    sleep 2
  -    rc ucarp start
  +    rc ucarp stop start
   
   %daily -u @l_susr@
       rcService ucarp enable yes || exit 0
  @@ -54,6 +52,6 @@
           -n ${ucarp_log_numfiles} -s ${ucarp_log_minsize} -d \
           -z ${ucarp_log_complevel} -m 644 -o @l_musr@ -g @l_mgrp@ \
           -P "${ucarp_log_prolog}" \
  -        -E "${ucarp_log_epilog}; rc ucarp restart" \
  +        -E "${ucarp_log_epilog}" \
           @l_prefix@/var/ucarp/ucarp.log
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/ucarp/ucarp.spec
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 ucarp.spec
  --- openpkg-src/ucarp/ucarp.spec      27 Jul 2004 17:26:56 -0000      1.1
  +++ openpkg-src/ucarp/ucarp.spec      4 Aug 2004 11:29:04 -0000       1.2
  @@ -34,7 +34,7 @@
   Group:        Network
   License:      Specific
   Version:      1.0
  -Release:      20040727
  +Release:      20040804
   
   #   package options
   %option       with_fsl  yes
  @@ -153,7 +153,9 @@
       #   determine installation files
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
           %{l_files_std} \
  -        '%config %{l_prefix}/etc/ucarp/*'
  +        '%not %dir %{l_prefix}/etc/fsl' \
  +        '%config %{l_prefix}/etc/ucarp/*' \
  +        '%config %{l_prefix}/etc/fsl/fsl.ucarp'
   
   %files -f files
   
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to