rpms/hplip/devel hplip.spec, 1.242, 1.243 hplip-retry-open.patch, 1.1, NONE

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25677

Modified Files:
	hplip.spec 
Removed Files:
	hplip-retry-open.patch 
Log Message:
* Fri Oct 30 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-20
- Reverted retry patch until it can be tested some more.



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -p -r1.242 -r1.243
--- hplip.spec	29 Oct 2009 13:08:05 -0000	1.242
+++ hplip.spec	30 Oct 2009 17:05:13 -0000	1.243
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -24,7 +24,6 @@ Patch8: hplip-non-scripts.patch
 Patch9: hplip-requirespageregion.patch
 Patch10: hplip-discovery-method.patch
 Patch11: hplip-device-reconnected.patch
-Patch12: hplip-retry-open.patch
 Patch13: hplip-plugin-error.patch
 Patch14: hplip-hpcups-sigpipe.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -149,9 +148,6 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Give up trying to print a job to a reconnected device (bug #515481).
 %patch11 -p1 -b .device-reconnected
 
-# Retry when connecting to device fails (bug #528483).
-%patch12 -p1 -b .retry-open
-
 # Set a printer-state-reason when there's a missing required plugin
 # (bug #531330).
 %patch13 -p1 -b .plugin-error
@@ -362,6 +358,9 @@ fi
 /usr/bin/update-desktop-database &>/dev/null ||:
 
 %changelog
+* Fri Oct 30 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-20
+- Reverted retry patch until it can be tested some more.
+
 * Thu Oct 29 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-19
 - Retry when connecting to device fails (bug #528483).
 - Avoid busy loop in hpcups when backend has exited (bug #525944).


--- hplip-retry-open.patch DELETED ---