rpms/cups/F-13 cups-str3425p2.patch,NONE,1.1 cups.spec,1.600,1.601
Jiří Popelka
jpopelka at fedoraproject.org
Tue Jun 1 15:34:26 UTC 2010
Author: jpopelka
Update of /cvs/pkgs/rpms/cups/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16266
Modified Files:
cups.spec
Added Files:
cups-str3425p2.patch
Log Message:
* Tue Jun 01 2010 Jiri Popelka <jpopelka at redhat.com> 1:1.4.3-10
- Added back still useful str3425.patch.
Second part of STR #3425 is still not fixed in 1.4.3
cups-str3425p2.patch:
job.c | 25 ++++++++++++++++++-------
1 file changed, 18 insertions(+), 7 deletions(-)
--- NEW FILE cups-str3425p2.patch ---
diff -up cups-1.4.3/scheduler/job.c.str3425p2 cups-1.4.3/scheduler/job.c
--- cups-1.4.3/scheduler/job.c.str3425p2 2010-06-01 17:16:46.000000000 +0200
+++ cups-1.4.3/scheduler/job.c 2010-06-01 17:19:10.000000000 +0200
@@ -2286,12 +2286,14 @@ cupsdSetJobState(
if (!cupsdLoadJob(job))
return;
- /*
- * Don't do anything if the state is unchanged...
- */
-
- if (newstate == (oldstate = job->state_value))
- return;
+ /*
+ * Don't do anything if the state is unchanged and we aren't purging the
+ * job...
+ */
+
+ oldstate = job->state_value;
+ if (newstate == oldstate && action != CUPSD_JOB_PURGE)
+ return;
/*
* Stop any processes that are working on the current job...
@@ -2498,6 +2500,15 @@ cupsdSetJobState(
job->dirty = 1;
cupsdMarkDirty(CUPSD_DIRTY_JOBS);
}
+ else if (!job->printer)
+ {
+ /*
+ * Delete the job immediately if not actively printing...
+ */
+
+ cupsdDeleteJob(job, CUPSD_JOB_PURGE);
+ job = NULL;
+ }
break;
}
@@ -2505,7 +2516,7 @@ cupsdSetJobState(
* Finalize the job immediately if we forced things...
*/
- if (action >= CUPSD_JOB_FORCE && job->printer)
+ if (action >= CUPSD_JOB_FORCE && job && job->printer)
finalize_job(job, 0);
/*
Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-13/cups.spec,v
retrieving revision 1.600
retrieving revision 1.601
diff -u -p -r1.600 -r1.601
--- cups.spec 18 May 2010 16:08:49 -0000 1.600
+++ cups.spec 1 Jun 2010 15:34:26 -0000 1.601
@@ -8,7 +8,7 @@
Summary: Common Unix Printing System
Name: cups
Version: 1.4.3
-Release: 9%{?dist}
+Release: 10%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -68,6 +68,7 @@ Patch34: cups-hp-deviceid-oid.patch
Patch35: cups-dnssd-deviceid.patch
Patch36: cups-ricoh-deviceid-oid.patch
Patch37: cups-texttops-rotate-page.patch
+Patch38: cups-str3425p2.patch
Patch100: cups-lspp.patch
@@ -279,6 +280,8 @@ module.
# This fixes page-label orientation when texttops is used in the
# filter chain (bug #572338).
%patch37 -p1 -b .texttops-rotate-page
+# Delete job files in /var/spool/cups (STR #3425)
+%patch38 -p1 -b .str3425p2
%if %lspp
# LSPP support.
@@ -579,6 +582,10 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so
%changelog
+* Tue Jun 01 2010 Jiri Popelka <jpopelka at redhat.com> 1:1.4.3-10
+- Added back still useful str3425.patch.
+ Second part of STR #3425 is still not fixed in 1.4.3
+
* Tue May 18 2010 Tim Waugh <twaugh at redhat.com> 1:1.4.3-9
- Adjust texttops output to be in natural orientation (STR #3563).
This fixes page-label orientation when texttops is used in the
More information about the scm-commits
mailing list