From 935f4b753c7a727176879231cc30c7a3af3b01fe Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Jun 26 2013 14:06:31 +0000
Subject: Merge branch 'f19'


---

diff --git a/cups-use-ipp1.1.patch b/cups-use-ipp1.1.patch
new file mode 100644
index 0000000..60f105a
--- /dev/null
+++ b/cups-use-ipp1.1.patch
@@ -0,0 +1,12 @@
+diff -up cups-1.7b1/cups/globals.c.use-ipp1.1 cups-1.7b1/cups/globals.c
+--- cups-1.7b1/cups/globals.c.use-ipp1.1	2013-06-26 15:05:54.615238227 +0100
++++ cups-1.7b1/cups/globals.c	2013-06-26 15:06:11.662299971 +0100
+@@ -219,7 +219,7 @@ cups_globals_alloc(void)
+   cg->any_root       = 1;
+   cg->expired_certs  = 1;
+   cg->expired_root   = 1;
+-  cg->server_version = 20;
++  cg->server_version = 11;
+ 
+ #ifdef DEBUG
+  /*
diff --git a/cups.spec b/cups.spec
index b026028..0dab790 100644
--- a/cups.spec
+++ b/cups.spec
@@ -14,7 +14,7 @@ Summary: CUPS printing system
 Name: cups
 Epoch: 1
 Version: 1.7
-Release: 0.10.%{prever}%{?dist}
+Release: 0.11.%{prever}%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Url: http://www.cups.org/
@@ -65,6 +65,7 @@ Patch31: cups-dymo-deviceid.patch
 Patch32: cups-freebind.patch
 Patch33: cups-no-gcry.patch
 Patch34: cups-libusb-quirks.patch
+Patch35: cups-use-ipp1.1.patch
 
 Patch100: cups-lspp.patch
 
@@ -247,6 +248,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
 %patch33 -p1 -b .no-gcry
 # Added libusb quirk for Canon PIXMA MP540 (bug #967873).
 %patch34 -p1 -b .libusb-quirks
+# Default to IPP/1.1 for now (bug #977813).
+%patch35 -p1 -b .use-ipp1.1
 
 %if %lspp
 # LSPP support.
@@ -635,6 +638,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man5/ipptoolfile.5.gz
 
 %changelog
+* Wed Jun 26 2013 Tim Waugh <twaugh@redhat.com> 1:1.7-0.11.b1
+- Default to IPP/1.1 for now (bug #977813).
+
 * Tue Jun 25 2013 Tim Waugh <twaugh@redhat.com> 1:1.7-0.10.b1
 - Added libusb quirk for Canon PIXMA MP540 (bug #967873).