rpms/hplip/devel hplip-3.9.10.tar.gz.asc, NONE, 1.1 .cvsignore, 1.33, 1.34 hplip-device-reconnected.patch, 1.1, 1.2 hplip.spec, 1.244, 1.245 sources, 1.33, 1.34 hplip-clear-previous-state-reasons.patch, 1.1, NONE hplip-hpcups-reorder.patch, 1.1, NONE hplip-non-scripts.patch, 1.2, NONE hplip-parenths.patch, 1.1, NONE hplip-plugin-error.patch, 1.1, NONE hplip-requirespageregion.patch, 1.2, NONE hplip-state-reasons-newline.patch, 1.1, NONE

Tim Waugh twaugh at fedoraproject.org
Wed Nov 4 16:43:30 UTC 2009 

Author: twaugh

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

Modified Files:
	.cvsignore hplip-device-reconnected.patch hplip.spec sources 
Added Files:
	hplip-3.9.10.tar.gz.asc 
Removed Files:
	hplip-clear-previous-state-reasons.patch 
	hplip-hpcups-reorder.patch hplip-non-scripts.patch 
	hplip-parenths.patch hplip-plugin-error.patch 
	hplip-requirespageregion.patch 
	hplip-state-reasons-newline.patch 
Log Message:
* Wed Nov  4 2009 Tim Waugh <twaugh at redhat.com> 3.9.10-1
- 3.9.10.  No longer need clear-previous-state-reasons,
  hpcups-reorder, non-scripts, parenths, plugin-error,
  requirespageregion or state-reasons-newline patches.



--- NEW FILE hplip-3.9.10.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAkrwszkACgkQhA7anpATwAUMowCdErRsdPydLdQ+AbMUnXmFK/9F
IVEAoIDD5umpZ61yzDBUPfnvAALZUBfI
=GQ71
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	5 Aug 2009 17:26:00 -0000	1.33
+++ .cvsignore	4 Nov 2009 16:43:29 -0000	1.34
@@ -30,3 +30,4 @@ hplip-2.8.12.tar.gz
 hplip-3.9.2.tar.gz
 hplip-3.9.6b.tar.gz
 hplip-3.9.8.tar.gz
+hplip-3.9.10.tar.gz

hplip-device-reconnected.patch:
 hp.c |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

Index: hplip-device-reconnected.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-device-reconnected.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hplip-device-reconnected.patch	29 Sep 2009 15:25:47 -0000	1.1
+++ hplip-device-reconnected.patch	4 Nov 2009 16:43:29 -0000	1.2
@@ -1,7 +1,7 @@
-diff -up hplip-3.9.8/prnt/backend/hp.c.device-reconnected hplip-3.9.8/prnt/backend/hp.c
---- hplip-3.9.8/prnt/backend/hp.c.device-reconnected	2009-09-29 16:02:14.717467334 +0100
-+++ hplip-3.9.8/prnt/backend/hp.c	2009-09-29 16:02:20.019342096 +0100
-@@ -638,6 +638,7 @@ int main(int argc, char *argv[])
+diff -up hplip-3.9.10/prnt/backend/hp.c.device-reconnected hplip-3.9.10/prnt/backend/hp.c
+--- hplip-3.9.10/prnt/backend/hp.c.device-reconnected	2009-11-03 21:45:10.000000000 +0000
++++ hplip-3.9.10/prnt/backend/hp.c	2009-11-04 16:25:30.719129509 +0000
+@@ -645,6 +645,7 @@ int main(int argc, char *argv[])
     HPMUD_DEVICE hd=-1;
     HPMUD_CHANNEL cd=-1;
     int n, total=0, retry=0, size, pages;
@@ -9,22 +9,23 @@ diff -up hplip-3.9.8/prnt/backend/hp.c.d
     enum HPMUD_RESULT stat;
     char *printer = getenv("PRINTER"); 
     
-@@ -789,10 +790,23 @@ int main(int argc, char *argv[])
-                /* IO error, get printer status. */
-                if (loop_test(hd, cd, &pa, argv[0], printer, argv[2], argv[1], argv[3]))
+@@ -809,11 +810,24 @@ int main(int argc, char *argv[])
+                {
+                   exit_stat = BACKEND_STOP;  /* stop queue */
                    goto bugout;
++	       }
 +
-+               if (++consecutive_failures == 5)
-+               {
-+                  /* hpmud_write_channel has failed several times in
-+                   * succession but the Device ID-based status says
-+                   * the printer is happy.  Time to face the fact that
-+                   * the device has probably reconnected, and our USB
-+                   * channel is invalidated. */
++	       if (++consecutive_failures == 5)
++	       {
++		 /* hpmud_write_channel has failed several times in
++		  * succession but the Device ID-based status says
++		  * the printer is happy.  Time to face the fact that
++		  * the device has probably reconnected, and our USB
++		  * channel is invalidated. */
 +
-+                  BUG("ERROR: device reconnected?");
-+                  goto bugout;
-+               }
++		 BUG("ERROR: device reconnected?");
++		 goto bugout;
+                }
              }
              else
              {


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -p -r1.244 -r1.245
--- hplip.spec	2 Nov 2009 16:36:50 -0000	1.244
+++ hplip.spec	4 Nov 2009 16:43:29 -0000	1.245
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 3.9.8
-Release: 21%{?dist}
+Version: 3.9.10
+Release: 1%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -13,18 +13,11 @@ Conflicts: selinux-policy < 3.0.3-3
 
 Url: http://hplip.sourceforge.net/
 Source0: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar.gz
-Patch1: hplip-hpcups-reorder.patch
 Patch2: hplip-strstr-const.patch
 Patch3: hplip-ui-optional.patch
 Patch4: hplip-no-asm.patch
-Patch5: hplip-clear-previous-state-reasons.patch
-Patch6: hplip-state-reasons-newline.patch
-Patch7: hplip-parenths.patch
-Patch8: hplip-non-scripts.patch
-Patch9: hplip-requirespageregion.patch
 Patch10: hplip-discovery-method.patch
 Patch11: hplip-device-reconnected.patch
-Patch13: hplip-plugin-error.patch
 Patch14: hplip-hpcups-sigpipe.patch
 Patch15: hplip-hpcups-plugin.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -49,7 +42,6 @@ BuildRequires: libusb-devel
 BuildRequires: openssl-devel
 BuildRequires: sane-backends-devel
 BuildRequires: dbus-devel
-BuildRequires: automake, autoconf, libtool
 
 %description
 The Hewlett-Packard Linux Imaging and Printing Project provides
@@ -116,9 +108,6 @@ SANE driver for scanners in HP's multi-f
 rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %setup -q
 
-# Upstream patch to fix paper size order and LJColor device class color space.
-%patch1 -p1 -b .hpcups-reorder
-
 # Fix compilation.
 %patch2 -p1 -b .strstr-const
 
@@ -128,31 +117,12 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Make sure to avoid handwritten asm.
 %patch4 -p1 -b .no-asm
 
-# Clear previous state reasons in the hp backend (bug #501338).
-%patch5 -p1 -b .clear-previous-state-reasons
-
-# Don't hide state reason changes by missing out newlines in stderr.
-%patch6 -p1 -b .state-reasons-newline
-
-# Fixed typos in page sizes (bug #515469).
-%patch7 -p1 -b .parenths
-
-# Don't install base/*.py with executable bit set.
-%patch8 -p1 -b .non-scripts
-
-# Set RequiresPageRegion in hpcups PPDs (bug #518756).
-%patch9 -p1 -b .requirespageregion
-
 # Fixed hp-setup traceback when discovery page is skipped (bug #523685).
 %patch10 -p1 -b .discovery-method
 
 # Give up trying to print a job to a reconnected device (bug #515481).
 %patch11 -p1 -b .device-reconnected
 
-# Set a printer-state-reason when there's a missing required plugin
-# (bug #531330).
-%patch13 -p1 -b .plugin-error
-
 # Avoid busy loop in hpcups when backend has exited (bug #525944).
 %patch14 -p1 -b .hpcups-sigpipe
 
@@ -161,9 +131,6 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %patch15 -p1 -b .hpcups-plugin
 
 %build
-aclocal
-automake --foreign --add-missing --copy
-autoconf
 %configure \
 	--enable-scan-build --enable-gui-build --enable-fax-build \
 	--disable-foomatic-rip-hplip-install --enable-pp-build \
@@ -363,6 +330,11 @@ fi
 /usr/bin/update-desktop-database &>/dev/null ||:
 
 %changelog
+* Wed Nov  4 2009 Tim Waugh <twaugh at redhat.com> 3.9.10-1
+- 3.9.10.  No longer need clear-previous-state-reasons,
+  hpcups-reorder, non-scripts, parenths, plugin-error,
+  requirespageregion or state-reasons-newline patches.
+
 * Mon Nov  2 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-21
 - Added 'requires proprietary plugin' to appropriate model names
   (bug #513283).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- sources	5 Aug 2009 17:26:01 -0000	1.33
+++ sources	4 Nov 2009 16:43:29 -0000	1.34
@@ -1 +1 @@
-cb1cf49c5f062993b78fc2768f531ed8  hplip-3.9.8.tar.gz
+de2c5e83794efdde10fca8379d2402a3  hplip-3.9.10.tar.gz


--- hplip-clear-previous-state-reasons.patch DELETED ---


--- hplip-hpcups-reorder.patch DELETED ---


--- hplip-non-scripts.patch DELETED ---


--- hplip-parenths.patch DELETED ---


--- hplip-plugin-error.patch DELETED ---


--- hplip-requirespageregion.patch DELETED ---


--- hplip-state-reasons-newline.patch DELETED ---

More information about the fedora-extras-commits mailing list