rpms/hplip/devel hplip-initscript.patch, NONE, 1.1 hplip.spec, 1.39, 1.40

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/hplip/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27596

Modified Files:
	hplip.spec 
Added Files:
	hplip-initscript.patch 
Log Message:
* Thu Jan  5 2006 Tim Waugh <twaugh at redhat.com> 0.9.7-7
- Fix initscript (bug #176966).


hplip-initscript.patch:
 hplip.sh |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE hplip-initscript.patch ---
--- hplip-0.9.7/hplip.sh.initscript	2005-09-22 19:33:13.000000000 +0100
+++ hplip-0.9.7/hplip.sh	2006-01-05 11:16:42.000000000 +0000
@@ -106,7 +106,12 @@
         echo
         [ $RETVAL = 0 ] && [ -d /var/lock/subsys ] && touch /var/lock/subsys/hpssd.py
 #        killall -HUP cupsd
-        return $RETVAL
+	if [ -f /var/lock/subsys/hpiod -a -f /var/lock/subsys/hpssd.py ]; then
+		touch /var/lock/subsys/hplip
+		return 0
+	else
+		return 1
+	fi
 }
 
 stop() {
@@ -128,6 +133,10 @@
                    rm $pidfile
 	   esac
         done
+        if [ ! -f /var/lock/subsys/hpiod -o \
+             ! -f /var/lock/subsys/hpssd.py ]; then
+        	rm -f /var/lock/subsys/hplip
+        fi
         return $RETVAL
 }       
 


Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- hplip.spec	2 Jan 2006 14:52:34 -0000	1.39
+++ hplip.spec	5 Jan 2006 11:18:01 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 0.9.7
-Release: 6
+Release: 7
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -12,6 +12,7 @@
 Patch2: hplip-desktop.patch
 Patch3: hplip-config.patch
 Patch4: hplip-0.9.7-2.patch
+Patch5: hplip-initscript.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -67,6 +68,9 @@
 # Apply patch 0.9.7-2
 %patch4 -p1 -b .0.9.7-2
 
+# Fix initscript (bug #176966).
+%patch5 -p1 -b .initscript
+
 %build
 %configure
 make
@@ -152,6 +156,9 @@
 fi
 
 %changelog
+* Thu Jan  5 2006 Tim Waugh <twaugh at redhat.com> 0.9.7-7
+- Fix initscript (bug #176966).
+
 * Mon Jan  2 2006 Tim Waugh <twaugh at redhat.com> 0.9.7-6
 - Rebuild.