- 0.9.9. No longer need quiet or 0.9.8-4 patches.

.cvsignore

@@ -4,3 +4,4 @@ hplip-0.9.5.tar.gz
 hplip-0.9.6.tar.gz
 hplip-0.9.7.tar.gz
 hplip-0.9.8.tar.gz
+hplip-0.9.9.tar.gz

hplip-quiet.patch

@@ -1,10 +0,0 @@
---- hplip-0.9.6/hpssd.py.quiet	2005-10-14 15:26:23.000000000 +0100
-+++ hplip-0.9.6/hpssd.py	2005-10-14 15:27:47.000000000 +0100
-@@ -1410,7 +1410,6 @@
- def main(args):
-     prop.prog = sys.argv[0]
-     prop.daemonize = True
--    utils.log_title('Services and Status Daemon', _VERSION)
- 
-     try:
-         opts, args = getopt.getopt(sys.argv[1:], 'l:xhp:', ['level=', 'help', 'port='])

hplip.spec

@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 0.9.8
+Version: 0.9.9
-Release: 6
+Release: 2
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -10,10 +10,8 @@ Obsoletes: xojpanel <= 0.91
 
 Url: http://sourceforge.net/projects/hpinkjet
 Source: http://kent.dl.sourceforge.net/sourceforge/hpinkjet/%{name}-%{version}.tar.gz
-Patch1: hplip-quiet.patch
+Patch1: hplip-desktop.patch
-Patch2: hplip-desktop.patch
+Patch2: hplip-config.patch
-Patch3: hplip-config.patch
-Patch4: hplip-0.9.8-4.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
 Requires: desktop-file-utils >= 0.2.92
@@ -59,17 +57,11 @@ SANE driver for scanners in HP's multi-function devices (from HPOJ).
 rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %setup -q
 
-# Quieten the hpssd daemon at startup (bug #170762).
-%patch1 -p1 -b .quiet
-
 # Use /usr/share/applications for putting desktop files in.
-%patch2 -p1 -b .desktop
+%patch1 -p1 -b .desktop
 
 # Use static IP ports (for SELinux policy).
-%patch3 -p1 -b .config
+%patch2 -p1 -b .config
-
-# Apply patch 0.9.8-4
-%patch4 -p1 -b .0.9.8-4
 
 %build
 %configure --disable-foomatic-install --disable-cups-install
@@ -160,6 +152,9 @@ if ! grep ^hpaio /etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
 fi
 
 %changelog
+* Thu Mar  9 2006 Tim Waugh <twaugh@redhat.com> 0.9.9-2
+- 0.9.9.  No longer need quiet or 0.9.8-4 patches.
+
 * Wed Mar 01 2006 Karsten Hopp <karsten@redhat.de> 0.9.8-6
 - Buildrequires: desktop-file-utils
 

sources

@@ -1 +1 @@
-3eae08ec7dbecdc03e7972b132dfdde6  hplip-0.9.8.tar.gz
+836affd511fd4831e6904b4f7f079c7d  hplip-0.9.9.tar.gz