OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 18-Jul-2003 00:11:53
Branch: HEAD Handle: 2003071723115102
Modified files:
openpkg-src/cvs cvs.spec rc.cvs
openpkg-web news.txt
Log:
PR#202: spec ghost log, %post, %preun; rc %status
Summary:
Revision Changes Path
1.64 +22 -4 openpkg-src/cvs/cvs.spec
1.12 +5 -2 openpkg-src/cvs/rc.cvs
1.5624 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cvs/cvs.spec
============================================================================
$ cvs diff -u -r1.63 -r1.64 cvs.spec
--- openpkg-src/cvs/cvs.spec 17 Jul 2003 15:32:33 -0000 1.63
+++ openpkg-src/cvs/cvs.spec 17 Jul 2003 22:11:53 -0000 1.64
@@ -37,9 +37,9 @@
Group: SCM
License: GPL
Version: %{V_cvs}
-Release: 20030717
+Release: 20030718
-# optional support for applying the RSE patches
+# package options
%option with_fsl yes
%option with_rse_patches yes
%option with_rse_patch_cvsuser_caller cvs
@@ -130,8 +130,6 @@
%install
rm -rf $RPM_BUILD_ROOT
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/var
( cd cvs-%{V_cvs}
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/rcs2log
@@ -159,15 +157,35 @@
%{SOURCE fsl.cvs} \
$RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+ # install ghost log
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/var/cvs
+ %{l_shtool} install -c /dev/null \
+ $RPM_BUILD_ROOT%{l_prefix}/var/cvs/cvs.log
+
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
'%not %dir %{l_prefix}/etc/fsl' \
'%config %{l_prefix}/etc/fsl/fsl.cvs' \
+ '%ghost %attr(644,%{l_musr},%{l_mgrp}) %{l_prefix}/var/cvs/cvs.log' \
'%attr(1777,-,-) %{l_prefix}/var/cvs/tmp'
%files -f files
%clean
rm -rf $RPM_BUILD_ROOT
+
+%post
+ # after upgrade, restart service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} cvs status 2>/dev/null`
+ [ ".$cvs_active" = .yes ] && %{l_rc} cvs restart
+ exit 0
+
+%preun
+ # before erase, stop service
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} cvs stop 2>/dev/null
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cvs/rc.cvs
============================================================================
$ cvs diff -u -r1.11 -r1.12 rc.cvs
--- openpkg-src/cvs/rc.cvs 17 Jul 2003 21:34:36 -0000 1.11
+++ openpkg-src/cvs/rc.cvs 17 Jul 2003 22:11:53 -0000 1.12
@@ -31,6 +31,7 @@
%start -p 200 -u @l_susr@
opService cvs enable yes || exit 0
+ opService 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 \
@@ -38,11 +39,13 @@
%stop -p 200 -u @l_susr@
opService cvs enable yes || exit 0
+ opService cvs active no && exit 0
cvs_pserverd_signal TERM
rm -f $cvs_pserverd_pidfile 2>/dev/null || true
%restart -p 200 -u @l_susr@
opService cvs enable yes || exit 0
+ opService cvs active no && exit 0
rc cvs stop start
%daily -u @l_susr@
@@ -51,8 +54,8 @@
# rotate logfile
shtool rotate -f \
-n${cvs_log_numfiles} -s${cvs_log_minsize} -d \
- -z${cvs_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
+ -z${cvs_log_complevel} -m644 [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ \
-P "${cvs_log_prolog}" \
- -E "${cvs_log_epilog}" \
+ -E "${cvs_log_epilog} && rc cvs restart" \
@l_prefix@/var/cvs/cvs.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5623 -r1.5624 news.txt
--- openpkg-web/news.txt 17 Jul 2003 22:05:23 -0000 1.5623
+++ openpkg-web/news.txt 17 Jul 2003 22:11:51 -0000 1.5624
@@ -1,3 +1,4 @@
+18-Jul-2003: Upgraded package: P<cvs-1.12.1-20030718>
18-Jul-2003: Upgraded package: P<postfix-2.0.13-20030718>
17-Jul-2003: Upgraded package: P<wine-20030709-20030717>
17-Jul-2003: Upgraded package: P<portfwd-0.26rc6-20030717>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
