rpms/hplip/devel hplip.spec,1.121,1.122

[fedora-cvs-commits at redhat.com]

Author: twaugh

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

Modified Files:
	hplip.spec 
Log Message:
* Mon Apr 16 2007 Tim Waugh <twaugh at redhat.com>
- Added /sbin/service and /sbin/chkconfig requirements for the scriptlets
  (bug #236445).
- Fixed %post scriptlet's condrestart logic (bug #236445).
- Resolves: rhbz#236445 rhbz#236445



Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- hplip.spec	13 Apr 2007 12:32:50 -0000	1.121
+++ hplip.spec	16 Apr 2007 09:31:43 -0000	1.122
@@ -24,6 +24,11 @@
 Patch9: hplip-media-empty.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
+Requires(post): /sbin/service
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/service
+Requires(preun): /sbin/chkconfig
+
 %define hpijs_epoch 1
 Requires: hpijs = %{hpijs_epoch}:%{version}-%{release}
 
@@ -178,6 +183,8 @@
 %{_bindir}/hp-testpage
 %{_bindir}/hp-unload
 %{_sbindir}/hpiod
+# Note: this must be /usr/lib not %{_libdir}, since that's the
+# CUPS serverbin directory.
 /usr/lib/cups/backend/hp
 /usr/lib/cups/backend/hpfax
 %{_libdir}/python*/site-packages/*
@@ -248,7 +255,7 @@
 
 %post
 /sbin/chkconfig --add hplip || :
-if [ "$1" == "1" ]; then
+if [ "$1" -ge "1" ]; then
   /sbin/service hplip condrestart >/dev/null 2>&1 || :
 fi
 exit 0
@@ -272,6 +279,11 @@
 exit 0
 
 %changelog
+* Mon Apr 16 2007 Tim Waugh <twaugh at redhat.com>
+- Added /sbin/service and /sbin/chkconfig requirements for the scriptlets
+  (bug #236445).
+- Fixed %%post scriptlet's condrestart logic (bug #236445).
+
 * Fri Apr 13 2007 Tim Waugh <twaugh at redhat.com> 1.7.2-6
 - Fixed dangling symlinks (bug #236156).
 - Move all fax bits to the gui package (bug #236161).