diff --git a/cups-str4326.patch b/cups-str4326.patch new file mode 100644 index 0000000..cf46afe --- /dev/null +++ b/cups-str4326.patch @@ -0,0 +1,21 @@ +diff -up cups-1.7.0/scheduler/ipp.c.str4326 cups-1.7.0/scheduler/ipp.c +--- cups-1.7.0/scheduler/ipp.c.str4326 2014-01-07 09:43:18.046423961 +0000 ++++ cups-1.7.0/scheduler/ipp.c 2014-01-07 09:44:21.774711070 +0000 +@@ -3,7 +3,7 @@ + * + * IPP routines for the CUPS scheduler. + * +- * Copyright 2007-2013 by Apple Inc. ++ * Copyright 2007-2014 by Apple Inc. + * Copyright 1997-2007 by Easy Software Products, all rights reserved. + * + * This file contains Kerberos support code, copyright 2006 by +@@ -6318,7 +6318,7 @@ get_jobs(cupsd_client_t *con, /* I - C + { + job_comparison = -1; + job_state = IPP_JOB_STOPPED; +- list = Jobs; ++ list = ActiveJobs; + } + else if (!strcmp(attr->values[0].string.text, "completed")) + { diff --git a/cups.spec b/cups.spec index 7e8c0ce..d733761 100644 --- a/cups.spec +++ b/cups.spec @@ -11,7 +11,7 @@ Summary: CUPS printing system Name: cups Epoch: 1 Version: 1.7.0 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 Group: System Environment/Daemons Url: http://www.cups.org/ @@ -73,6 +73,7 @@ Patch44: cups-jobhistory.patch Patch45: cups-journal.patch Patch46: cups-synconclose.patch Patch47: cups-dbus-notifier.patch +Patch48: cups-str4326.patch Patch100: cups-lspp.patch @@ -278,6 +279,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results. %patch46 -p1 -b .synconclose # Avoid stale lockfile in dbus notifier (bug #1026949). %patch47 -p1 -b .dbus-notifier +# Return jobs in rank order when handling IPP-Get-Jobs (STR #4326). +%patch48 -p1 -b .str4326 %if %lspp # LSPP support. @@ -658,6 +661,9 @@ rm -f %{cups_serverbin}/backend/smb %{_mandir}/man5/ipptoolfile.5.gz %changelog +* Tue Jan 7 2014 Tim Waugh - 1:1.7.0-10 +- Return jobs in rank order when handling IPP-Get-Jobs (STR #4326). + * Thu Jan 2 2014 Tim Waugh - 1:1.7.0-9 - dbus notifier: call _exit when handling SIGTERM (STR #4314). - Use '-f' when using rm in %%setup section.