From 03e73a97b8ee712245974e9d09ad236383b82532 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Aug 06 2013 16:29:24 +0000
Subject: Merge branch 'f19'


---

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 663da48..98d20a5 100644
--- a/cups.spec
+++ b/cups.spec
@@ -14,7 +14,7 @@ Summary: CUPS printing system
 Name: cups
 Epoch: 1
 Version: 1.7
-Release: 0.22.%{prever}%{?dist}
+Release: 0.23.%{prever}%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Url: http://www.cups.org/
@@ -68,6 +68,7 @@ Patch35: cups-use-ipp1.1.patch
 Patch36: cups-avahi-no-threaded.patch
 Patch37: cups-gz-crc.patch
 Patch38: cups-build.patch
+Patch39: cups-ipp-multifile.patch
 
 Patch100: cups-lspp.patch
 
@@ -256,6 +257,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
 %patch37 -p1 -b .gz-crc
 # Fixed build.
 %patch38 -p1 -b .build
+# Fixes for jobs with multiple files and multiple formats.
+%patch39 -p1 -b .ipp-multifile
 
 %if %lspp
 # LSPP support.
@@ -630,6 +633,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man5/ipptoolfile.5.gz
 
 %changelog
+* Tue Aug  6 2013 Tim Waugh <twaugh@redhat.com> - 1:1.7-0.23.rc1
+- Fixes for jobs with multiple files and multiple formats.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.7-0.22.rc1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild