From 27385a83c589528f495e3165aa246c935c696f4e Mon Sep 17 00:00:00 2001
From: Miloš Jakubíček <mjakubicek@fedoraproject.org>
Date: Apr 08 2009 00:01:02 +0000
Subject: - Fix logrotate script (resolves BZ#494179).


---

diff --git a/boinc-client-logrotate-d b/boinc-client-logrotate-d
index 6d27d78..3aeee0d 100644
--- a/boinc-client-logrotate-d
+++ b/boinc-client-logrotate-d
@@ -9,7 +9,8 @@
 
 # Author: Kathryn Marks <kathryn.boinc@gmail.com>
 # Created: October 6, 2007
-# Last Modified: October 15, 2007
+# Modified: Milos Jakubicek <xjakub@fi.muni.cz>
+# Last Modified: April 7, 2009
 ######################################################################
 
 # Global Parameters
@@ -22,55 +23,24 @@ nomail
 
 # 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 ##
diff --git a/boinc-client.spec b/boinc-client.spec
index 807c35f..7028170 100644
--- a/boinc-client.spec
+++ b/boinc-client.spec
@@ -4,7 +4,7 @@
 Summary:	The BOINC client core
 Name:		boinc-client
 Version:	6.4.7
-Release:	8.r%{revision}svn%{?dist}
+Release:	9.r%{revision}svn%{?dist}
 License:	LGPLv2+
 Group:		Applications/Engineering
 URL:		http://boinc.berkeley.edu/
@@ -331,6 +331,9 @@ fi
 %{_includedir}/boinc/*
 
 %changelog
+* Wed Apr 08 2009 Milos Jakubicek <xjakub@fi.muni.cz> - 6.4.7-9.r17542svn
+- Fix logrotate script (resolves BZ#494179).
+
 * Fri Mar 27 2009 Milos Jakubicek <xjakub@fi.muni.cz> - 6.4.7-8.r17542svn
 - Make the -doc subpackage noarch.