[cups: 2/2] Merge branch 'f21'

[Tim Waugh]

commit f64b8b6106fdbcc82ce80623d7971d8fc052034c
Merge: 49f89e6 5b29618
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Oct 15 13:13:41 2014 +0100

    Merge branch 'f21'

 cups-str4500.patch |   16 ++++++++++++++++
 cups.spec          |   10 +++++++++-
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --cc cups.spec
index 93413ab,92e229e..f0a845c
--- a/cups.spec
+++ b/cups.spec
@@@ -10,8 -10,8 +10,8 @@@
  Summary: CUPS printing system
  Name: cups
  Epoch: 1
 -Version: 1.7.5
 -Release: 9%{?dist}
 +Version: 2.0.0
- Release: 4%{?dist}
++Release: 5%{?dist}
  License: GPLv2
  Url: http://www.cups.org/
  Source: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2
@@@ -65,6 -65,10 +65,7 @@@ Patch35: cups-ipp-multifile.patc
  Patch36: cups-web-devices-timeout.patch
  Patch37: cups-journal.patch
  Patch38: cups-synconclose.patch
 -Patch39: cups-str4461.patch
 -Patch40: cups-str2913.patch
 -Patch41: cups-str4475.patch
 -Patch42: cups-str4500.patch
++Patch39: cups-str4500.patch
  
  Patch100: cups-lspp.patch
  
@@@ -261,6 -267,16 +262,9 @@@ Sends IPP requests to the specified UR
  %patch37 -p1 -b .journal
  # Set the default for SyncOnClose to Yes.
  %patch38 -p1 -b .synconclose
 -# Fix conf/log file reading for authenticated users (STR #4461).
 -%patch39 -p1 -b .str4461
 -# Upstream patch for STR #2913 to limit Get-Jobs replies to 500 jobs
 -# (bug #421671).
 -%patch40 -p1 -b .str2913
 -# Fix icon display in web interface during server restart (STR #4475).
 -%patch41 -p1 -b .str4475
+ # Fix cupsGetPPD3() so it doesn't give the caller an unreadable file
+ # (bug #1150917, STR #4500).
 -%patch42 -p1 -b .str4500
++%patch39 -p1 -b .str4500
  
  %if %lspp
  # LSPP support.
@@@ -606,7 -684,11 +610,11 @@@ rm -f %{cups_serverbin}/backend/sm
  %{_mandir}/man5/ipptoolfile.5.gz
  
  %changelog
 -* Wed Oct 15 2014 Tim Waugh <twaugh at redhat.com> - 1:1.7.5-9
++* Wed Oct 15 2014 Tim Waugh <twaugh at redhat.com> - 1:2.0.0-5
+ - Fix cupsGetPPD3() so it doesn't give the caller an unreadable file
+   (bug #1150917, STR #4500).
+ 
 -* Wed Oct 15 2014 Tim Waugh <twaugh at redhat.com> - 1:1.7.5-8
 +* Wed Oct 15 2014 Tim Waugh <twaugh at redhat.com> - 1:2.0.0-4
  - Can no longer reproduce bug #1010580 so removing final-content-type
    patch as it causes issues for some backends (bug #1149244).