Merge branch 'f13' into f14

cups.init

@@ -49,7 +49,7 @@ DAEMON=cupsd
 exec=/usr/sbin/cupsd
 prog=cups
 config=/etc/cups/cupsd.conf
-lockfile=/var/lock/subsys/$DAEMON
+lockfile=/var/lock/subsys/cups
 
 check() {
 	# Check that we're a privileged user
@@ -129,7 +129,7 @@ case $1 in
 		echo
 	;;
 	status)
-		status $DAEMON
+		status -l $(basename $lockfile) $DAEMON
 		RETVAL=$?
 	;;
 	restartlog)

cups.spec

@@ -8,7 +8,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -573,6 +573,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Fri Dec 03 2010 Jiri Popelka <jpopelka@redhat.com> 1:1.4.5-2
+- Changed subsystem lock file name in initscript
+  so the service is correctly stopped on reboot or halt (bug #659391).
+
 * Fri Nov 12 2010 Jiri Popelka <jpopelka@redhat.com> 1:1.4.5-1
 - 1.4.5.
 - No longer need CVE-2010-2941, str3608