OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 17-Sep-2003 22:45:40
Branch: HEAD Handle: 2003091721453802
Modified files:
openpkg-src/spread spread.spec
openpkg-web news.txt
Log:
Finally introduce logging (no fsl due to special hand-kludged spread
log style), and complete implementation of ticket #202 features
Summary:
Revision Changes Path
1.22 +23 -8 openpkg-src/spread/spread.spec
1.6609 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/spread/spread.spec
============================================================================
$ cvs diff -u -r1.21 -r1.22 spread.spec
--- openpkg-src/spread/spread.spec 16 Sep 2003 17:39:58 -0000 1.21
+++ openpkg-src/spread/spread.spec 17 Sep 2003 20:45:40 -0000 1.22
@@ -33,7 +33,7 @@
Group: Network
License: BSD-style
Version: 3.17.1
-Release: 20030916
+Release: 20030917
# package options
%option with_perl no
@@ -45,8 +45,12 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, perl, gcc, flex, bison, sed
+BuildPreReq: OpenPKG, openpkg >= 20020206, gcc, flex, bison, sed
PreReq: OpenPKG, openpkg >= 20020206
+%if "%{with_perl}" == "yes"
+BuildPreReq: perl
+PreReq: perl
+%endif
AutoReq: no
AutoReqProv: no
@@ -60,14 +64,18 @@
%prep
%setup -q -n spread-src-%{version}
%{l_shtool} subst \
- -e "s;.*\(DaemonUser\).*;\1 = %{l_rusr};" \
- -e "s;.*\(DaemonGroup\).*;\1 = %{l_mgrp};" \
- -e "s;.*\(RuntimeDir\).*;\1 = %{l_prefix}/var/spread;" \
+ -e "s;^[# \t]*\(DaemonUser\).*;\1 = %{l_rusr};" \
+ -e "s;^[# \t]*\(DaemonGroup\).*;\1 = %{l_mgrp};" \
+ -e "s;^[# \t]*\(RuntimeDir\).*;\1 = %{l_prefix}/var/spread;" \
+ -e "s;^[# \t]*\(EventLogFile\).*;\1 = %{l_prefix}/var/spread/spread.log;" \
-e "s;^[ \t]*localhost[ \t]*127.0.0.1;\t`%{l_shtool} echo -e %h%d`;" \
sample.spread.conf
%{l_shtool} subst \
-e "s;/etc\(/spread.access_ip\);%{l_prefix}/etc/spread\1;g" \
auth-ip.c
+ %{l_shtool} subst \
+ -e "s;My\.name;\"spread.log\";g" \
+ log.c
%build
%{l_shtool} subst -e "s;if test ! -d \$piddir;if false;" configure
@@ -110,11 +118,15 @@
%{l_shtool} install -c -m 755 %{l_value -s -a} \
%{SOURCE rc.spread} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+ # install bogus log file, to avoid first time run failure
+ touch -f $RPM_BUILD_ROOT%{l_prefix}/var/spread/spread.log
+
%if "%{with_perl}" == "yes"
eval `%{l_prefix}/bin/perl -V:installarchlib -V:installprivlib
-V:installsitearch -V:installsitelib`
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
- "%config %attr(644) %{l_prefix}/etc/spread/*" \
+ "%config %{l_prefix}/etc/spread/*" \
+ "%attr(0644,%{l_rusr},%{l_mgrp}) %{l_prefix}/var/spread/spread.log" \
"%not %dir %{l_prefix}/lib/perl" \
"%not %dir %{l_prefix}/lib/perl/*" \
"%not %dir $installarchlib" \
@@ -126,7 +138,10 @@
"%not %dir $installsitearch/auto" \
"%not %dir $installsitelib/auto"
%else
- %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+ %{l_files_std} \
+ "%config %{l_prefix}/etc/spread/*" \
+ "%attr(0644,%{l_rusr},%{l_mgrp}) %{l_prefix}/var/spread/spread.log"
%endif
%files -f files
@@ -153,6 +168,6 @@
# before erase, stop service and remove log files
[ $1 -eq 0 ] || exit 0
%{l_rc} spread stop 2>/dev/null
- rm -f $RPM_INSTALL_PREFIX/var/cvsd/*.log* >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/spread/*.log* >/dev/null 2>&1 || true
exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6608 -r1.6609 news.txt
--- openpkg-web/news.txt 17 Sep 2003 19:40:38 -0000 1.6608
+++ openpkg-web/news.txt 17 Sep 2003 20:45:38 -0000 1.6609
@@ -1,3 +1,4 @@
+17-Sep-2003: Upgraded package: P<spread-3.17.1-20030917>
17-Sep-2003: Upgraded package: P<gcc34-3.4s20030917-20030917>
17-Sep-2003: Upgraded package: P<mcrypt-2.6.4-20030917>
17-Sep-2003: Upgraded package: P<libmcrypt-2.5.7-20030917>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
