rpms/cups/devel cups-str3425.patch, 1.2, 1.3 cups.spec, 1.570, 1.571 cups-delete-active-printer.patch, 1.1, NONE

[Tim Waugh]

Author: twaugh

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

Modified Files:
	cups-str3425.patch cups.spec 
Removed Files:
	cups-delete-active-printer.patch 
Log Message:
* Wed Dec 23 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-21
- Fixed patch for STR #3425 again by adding in back-ported change from
  svn revision 8929 (bug #549899).  No longer need
  delete-active-printer patch.


cups-str3425.patch:
 job.c  |   10 ++++------
 main.c |   21 +++++++++++----------
 2 files changed, 15 insertions(+), 16 deletions(-)

Index: cups-str3425.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-str3425.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- cups-str3425.patch	19 Dec 2009 13:03:41 -0000	1.2
+++ cups-str3425.patch	23 Dec 2009 11:19:51 -0000	1.3
@@ -1,6 +1,6 @@
 diff -up cups-1.4.2/scheduler/job.c.str3425 cups-1.4.2/scheduler/job.c
---- cups-1.4.2/scheduler/job.c.str3425	2009-12-19 12:12:18.346037032 +0000
-+++ cups-1.4.2/scheduler/job.c	2009-12-19 12:12:35.806163016 +0000
+--- cups-1.4.2/scheduler/job.c.str3425	2009-12-23 11:00:06.070056898 +0000
++++ cups-1.4.2/scheduler/job.c	2009-12-23 11:02:22.889056232 +0000
 @@ -253,7 +253,7 @@ cupsdCancelJobs(const char *dest,	/* I -
        if (purge)
  	cupsdSetJobState(job, IPP_JOB_CANCELED, CUPSD_JOB_PURGE,
@@ -33,9 +33,18 @@ diff -up cups-1.4.2/scheduler/job.c.str3
  	break;
    }
  
+@@ -2507,7 +2505,7 @@ cupsdSetJobState(
+   * Finalize the job immediately if we forced things...
+   */
+ 
+-  if (action == CUPSD_JOB_FORCE)
++  if (action >= CUPSD_JOB_FORCE && job->printer)
+     finalize_job(job);
+ 
+  /*
 diff -up cups-1.4.2/scheduler/main.c.str3425 cups-1.4.2/scheduler/main.c
---- cups-1.4.2/scheduler/main.c.str3425	2009-12-19 12:12:18.221037105 +0000
-+++ cups-1.4.2/scheduler/main.c	2009-12-19 12:12:18.434038283 +0000
+--- cups-1.4.2/scheduler/main.c.str3425	2009-12-23 11:00:05.687056970 +0000
++++ cups-1.4.2/scheduler/main.c	2009-12-23 11:00:06.156057773 +0000
 @@ -389,7 +389,7 @@ main(int  argc,				/* I - Number of comm
      * parent's file descriptors to be blocking.  This is a workaround for a
      * limitation of userland libpthread on OpenBSD.


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.570
retrieving revision 1.571
diff -u -p -r1.570 -r1.571
--- cups.spec	22 Dec 2009 17:06:04 -0000	1.570
+++ cups.spec	23 Dec 2009 11:19:51 -0000	1.571
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -71,9 +71,8 @@ Patch45: cups-str3436.patch
 Patch46: cups-str3425.patch
 Patch47: cups-str3428.patch
 Patch48: cups-str3431.patch
-Patch49: cups-delete-active-printer.patch
-Patch50: cups-gnutls-gcrypt-threads.patch
-Patch51: cups-str3458.patch
+Patch49: cups-gnutls-gcrypt-threads.patch
+Patch50: cups-str3458.patch
 
 Patch100: cups-lspp.patch
 
@@ -252,9 +251,8 @@ module. 
 %patch46 -p1 -b .str3425
 %patch47 -p1 -b .str3428
 %patch48 -p1 -b .str3431
-%patch49 -p1 -b .delete-active-printer
-%patch50 -p1 -b .gnutls-gcrypt-threads
-%patch51 -p1 -b .str3458
+%patch49 -p1 -b .gnutls-gcrypt-threads
+%patch50 -p1 -b .str3458
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -545,6 +543,11 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Wed Dec 23 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-21
+- Fixed patch for STR #3425 again by adding in back-ported change from
+  svn revision 8929 (bug #549899).  No longer need
+  delete-active-printer patch.
+
 * Tue Dec 22 2009 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-20
 - Fixed ipp authentication for servers requiring authentication for
   IPP-Get-Printer-Attributes (bug #548873, STR #3458).


--- cups-delete-active-printer.patch DELETED ---