From dcaa0f564db4e35703411a57b9b1eb7da4d24042 Mon Sep 17 00:00:00 2001
From: Miloš Jakubíček <mjakubicek@fedoraproject.org>
Date: Apr 14 2009 16:06:09 +0000
Subject: - Fix lock file name in logrotate script, do not override global logrotate

    configuration (BZ#494179).

---

diff --git a/boinc-client-logrotate-d b/boinc-client-logrotate-d
index 3aeee0d..f7615be 100644
--- a/boinc-client-logrotate-d
+++ b/boinc-client-logrotate-d
@@ -10,38 +10,28 @@
 # Author: Kathryn Marks <kathryn.boinc@gmail.com>
 # Created: October 6, 2007
 # Modified: Milos Jakubicek <xjakub@fi.muni.cz>
-# Last Modified: April 7, 2009
+# Last Modified: April 12, 2009
 ######################################################################
 
-# Global Parameters
-
-missingok
-compress
-delaycompress
-notifempty
-nomail
-
-# Log Specific Parameters
-
-# boinc.log and boincerr.log
-
 /var/log/boinc.log /var/log/boincerr.log
 {
-        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
+	missingok
+	compress
+	delaycompress
+	notifempty
+	nomail
+	create 664 boinc boinc
+	sharedscripts
+	prerotate
+	if [ -f /var/lock/subsys/boinc-client ]; then
+		touch /var/run/boinc_was_running
+		service boinc-client stop >& /dev/null
+	fi
+	endscript
+	postrotate
+	if [ -f /var/run/boinc_was_running ]; then
+		rm /var/run/boinc_was_running
+		service boinc-client start >& /dev/null
+	fi
+	endscript
 }
-
-## EOF ##
-
diff --git a/boinc-client.spec b/boinc-client.spec
index 3ebd513..fa9add4 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:	9.r%{revision}svn%{?dist}
+Release:	10.r%{revision}svn%{?dist}
 License:	LGPLv2+
 Group:		Applications/Engineering
 URL:		http://boinc.berkeley.edu/
@@ -331,6 +331,10 @@ fi
 %{_includedir}/boinc/*
 
 %changelog
+* Wed Apr 14 2009 Milos Jakubicek <xjakub@fi.muni.cz> - 6.4.7-10.r17542svn
+- Fix lock file name in logrotate script, do not override
+  global logrotate configuration (BZ#494179).
+
 * Wed Apr 08 2009 Milos Jakubicek <xjakub@fi.muni.cz> - 6.4.7-9.r17542svn
 - Fix logrotate script (resolves BZ#494179).