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

Fixes for jobs with multiple files and multiple formats.

Browse Source 
Resolves: rhbz#972242
This commit is contained in:
Tim Waugh 2013-08-06 17:27:37 +01:00
parent 58a593e9fe
commit 4f3285485a
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cups-ipp-multifile.patch Normal file
View File

@ -0,0 +1,20 @@
diff -up cups-1.6.3/backend/ipp.c.ipp-multifile cups-1.6.3/backend/ipp.c
--- cups-1.6.3/backend/ipp.c.ipp-multifile 2013-08-06 17:17:19.359471503 +0100
+++ cups-1.6.3/backend/ipp.c 2013-08-06 17:19:03.346990727 +0100
@@ -1682,10 +1682,13 @@ main(int argc, /* I - Number of comm
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
"requesting-user-name", NULL, argv[2]);
- if ((i + 1) >= num_files)
- ippAddBoolean(request, IPP_TAG_OPERATION, "last-document", 1);
+ ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
+ (i + 1) >= num_files);
- if (document_format)
+ if (num_files > 1)
+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
+ "document-format", NULL, "application/octet-stream");
+ else if (document_format)
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
"document-format", NULL, document_format);

8
cups.spec
View File

@ -11,7 +11,7 @@ Summary: CUPS printing system
Name: cups Name: cups
Epoch: 1 Epoch: 1
Version: 1.6.3 Version: 1.6.3
Release: 4%{?dist} Release: 5%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Url: http://www.cups.org/ Url: http://www.cups.org/
@ -63,6 +63,7 @@ Patch32: cups-use-ipp1.1.patch
Patch33: cups-no-gcry.patch Patch33: cups-no-gcry.patch
Patch34: cups-avahi-no-threaded.patch Patch34: cups-avahi-no-threaded.patch
Patch35: cups-gz-crc.patch Patch35: cups-gz-crc.patch
Patch36: cups-ipp-multifile.patch
Patch100: cups-lspp.patch Patch100: cups-lspp.patch
@ -248,6 +249,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
%patch34 -p1 -b .avahi-no-threaded %patch34 -p1 -b .avahi-no-threaded
# Avoid sign-extending CRCs for gz decompression (bug #983486). # Avoid sign-extending CRCs for gz decompression (bug #983486).
%patch35 -p1 -b .gz-crc %patch35 -p1 -b .gz-crc
# Fixes for jobs with multiple files and multiple formats.
%patch36 -p1 -b .ipp-multifile
%if %lspp %if %lspp
# LSPP support. # LSPP support.
@ -634,6 +637,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz %{_mandir}/man5/ipptoolfile.5.gz
%changelog %changelog
* Tue Aug 6 2013 Tim Waugh <twaugh@redhat.com> - 1:1.6.3-5
- Fixes for jobs with multiple files and multiple formats.
* Wed Jul 24 2013 Tim Waugh <twaugh@redhat.com> - 1:1.6.3-4 * Wed Jul 24 2013 Tim Waugh <twaugh@redhat.com> - 1:1.6.3-4
- Fixed cups-config, broken by last change (bug #987660). - Fixed cups-config, broken by last change (bug #987660).