rpms/cups
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Return jobs in rank order when handling IPP-Get-Jobs (STR #4326).

Browse Source
This commit is contained in:
Tim Waugh 2014-01-07 09:48:26 +00:00
parent fd624c76f2
commit ca5992f31a
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cups-str4326.patch Normal file
View File

@ -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"))
{

8
cups.spec
View File

@ -11,7 +11,7 @@ Summary: CUPS printing system
Name: cups Name: cups
Epoch: 1 Epoch: 1
Version: 1.7.0 Version: 1.7.0
Release: 9%{?dist} Release: 10%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Url: http://www.cups.org/ Url: http://www.cups.org/
@ -73,6 +73,7 @@ Patch44: cups-jobhistory.patch
Patch45: cups-journal.patch Patch45: cups-journal.patch
Patch46: cups-synconclose.patch Patch46: cups-synconclose.patch
Patch47: cups-dbus-notifier.patch Patch47: cups-dbus-notifier.patch
Patch48: cups-str4326.patch
Patch100: cups-lspp.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 %patch46 -p1 -b .synconclose
# Avoid stale lockfile in dbus notifier (bug #1026949). # Avoid stale lockfile in dbus notifier (bug #1026949).
%patch47 -p1 -b .dbus-notifier %patch47 -p1 -b .dbus-notifier
# Return jobs in rank order when handling IPP-Get-Jobs (STR #4326).
%patch48 -p1 -b .str4326
%if %lspp %if %lspp
# LSPP support. # LSPP support.
@ -658,6 +661,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz %{_mandir}/man5/ipptoolfile.5.gz
%changelog %changelog
* Tue Jan 7 2014 Tim Waugh <twaugh@redhat.com> - 1:1.7.0-10
- Return jobs in rank order when handling IPP-Get-Jobs (STR #4326).
* Thu Jan 2 2014 Tim Waugh <twaugh@redhat.com> - 1:1.7.0-9 * Thu Jan 2 2014 Tim Waugh <twaugh@redhat.com> - 1:1.7.0-9
- dbus notifier: call _exit when handling SIGTERM (STR #4314). - dbus notifier: call _exit when handling SIGTERM (STR #4314).
- Use '-f' when using rm in %%setup section. - Use '-f' when using rm in %%setup section.