From 4f3285485a184c2088aa96d3ab4ca1cfe7405e89 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Aug 06 2013 16:27:37 +0000
Subject: Fixes for jobs with multiple files and multiple formats.


Resolves: rhbz#972242

---

diff --git a/cups-ipp-multifile.patch b/cups-ipp-multifile.patch
new file mode 100644
index 0000000..087a556
--- /dev/null
+++ b/cups-ipp-multifile.patch
@@ -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);
+ 
diff --git a/cups.spec b/cups.spec
index 560ea09..c1b78ec 100644
--- a/cups.spec
+++ b/cups.spec
@@ -11,7 +11,7 @@ Summary: CUPS printing system
 Name: cups
 Epoch: 1
 Version: 1.6.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Url: http://www.cups.org/
@@ -63,6 +63,7 @@ Patch32: cups-use-ipp1.1.patch
 Patch33: cups-no-gcry.patch
 Patch34: cups-avahi-no-threaded.patch
 Patch35: cups-gz-crc.patch
+Patch36: cups-ipp-multifile.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
 # Avoid sign-extending CRCs for gz decompression (bug #983486).
 %patch35 -p1 -b .gz-crc
+# Fixes for jobs with multiple files and multiple formats.
+%patch36 -p1 -b .ipp-multifile
 
 %if %lspp
 # LSPP support.
@@ -634,6 +637,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man5/ipptoolfile.5.gz
 
 %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
 - Fixed cups-config, broken by last change (bug #987660).