Finally introduce logging (no fsl due to special hand-kludged spread log style), and complete implementation of ticket #202 features

spread/spread.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [PLUS]
 Group:        Network
 License:      BSD-style
 Version:      3.17.1
-Release:      20030916
+Release:      20030917
 
 #   package options
 %option       with_perl   no
@@ -45,8 +45,12 @@ Source1:      rc.spread
 #   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 @@ AutoReqProv:  no
 %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 @@ AutoReqProv:  no
     %{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 @@ AutoReqProv:  no
         "%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 @@ AutoReqProv:  no
     #   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