rpms/boinc-client/F-9 boinc-client-logrotate-d, 1.1, 1.2 boinc-client.spec, 1.21, 1.22

[Miloš Jakubíček]

Author: mjakubicek

Update of /cvs/pkgs/rpms/boinc-client/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14558

Modified Files:
	boinc-client-logrotate-d boinc-client.spec 
Log Message:
- Fix logrotate script (resolves BZ#494179).




Index: boinc-client-logrotate-d
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/F-9/boinc-client-logrotate-d,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- boinc-client-logrotate-d	25 Mar 2008 20:13:30 -0000	1.1
+++ boinc-client-logrotate-d	8 Apr 2009 00:12:28 -0000	1.2
@@ -9,7 +9,8 @@
 
 # Author: Kathryn Marks <kathryn.boinc at gmail.com>
 # Created: October 6, 2007
-# Last Modified: October 15, 2007
+# Modified: Milos Jakubicek <xjakub at fi.muni.cz>
+# Last Modified: April 7, 2009
 ######################################################################
 
 # Global Parameters
@@ -22,55 +23,24 @@
 
 # Log Specific Parameters
 
-# boinc.log
+# boinc.log and boincerr.log
 
-# Normal usage:
-# Rotate weekly and keep about 2 months worth
-
-/var/log/boinc.log
-{
-	weekly
-	rotate 8
-	create 664 boinc boinc
-	sharedscripts
-	prerotate
-	  if [ -f /var/lock/subsys/boinc ]; then
-	    touch /var/run/boinc_was_running
-	    /etc/init.d/boinc stop
-	  fi
-	endscript
-	postrotate
-	  if [ -f /var/run/boinc_was_running ]; then
-	    rm /var/run/boinc_was_running
-	    /etc/init.d/boinc start
-	  fi
-	endscript 	
-}
-
-
-# boincerr.log
-
-# Normal usage:
-# Rotate monthly and keep about 2 months worth
-
-/var/log/boincerr.log
+/var/log/boinc.log /var/log/boincerr.log
 {
-	monthly
-	rotate 2
-	create 664 boinc boinc
-	sharedscripts
-	prerotate
-	  if [ -f /var/lock/subsys/boinc ]; then
-	    touch /var/run/boinc_was_running
-	    /etc/init.d/boinc stop
-	  fi
-	endscript
-	postrotate
-	  if [ -f /var/run/boinc_was_running ]; then
-	    rm /var/run/boinc_was_running
-	    /etc/init.d/boinc start
-	  fi
-	endscript 	
+        create 664 boinc boinc
+        sharedscripts
+        prerotate
+          if [ -f /var/lock/subsys/boinc ]; then
+            touch /var/run/boinc_was_running
+            /etc/init.d/boinc-client stop
+          fi
+        endscript
+        postrotate
+          if [ -f /var/run/boinc_was_running ]; then
+            rm /var/run/boinc_was_running
+            /etc/init.d/boinc-client start
+          fi
+        endscript
 }
 
 ## EOF ##


Index: boinc-client.spec
===================================================================
RCS file: /cvs/pkgs/rpms/boinc-client/F-9/boinc-client.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- boinc-client.spec	27 Mar 2009 01:12:45 -0000	1.21
+++ boinc-client.spec	8 Apr 2009 00:12:28 -0000	1.22
@@ -4,7 +4,7 @@
 Summary:	The BOINC client core
 Name:		boinc-client
 Version:	6.4.7
-Release:	7.r%{revision}svn%{?dist}
+Release:	8.r%{revision}svn%{?dist}
 License:	LGPLv2+
 Group:		Applications/Engineering
 URL:		http://boinc.berkeley.edu/
@@ -330,6 +330,9 @@
 %{_includedir}/boinc/*
 
 %changelog
+* Wed Apr 08 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.7-8.r17542svn
+- Fix logrotate script (resolves BZ#494179).
+
 * Thu Mar 26 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 6.4.7-7.r17542svn
 - Split most documentation into a separate -doc subpackage (resolves #492442).