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

[Tim Waugh]

commit 37f28ef8e0d18c4eb08d5d80e96d8166b21d01a0
Merge: 5577ebf d10ba26
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Aug 26 14:59:41 2014 +0100

    Merge branch 'f20' into f21

 cups-str4461.patch |  111 +++++++++++++++++++++++++++++++++++++++++++---------
 cups.spec          |    5 ++-
 2 files changed, 96 insertions(+), 20 deletions(-)
---
diff --cc cups.spec
index a06238b,2063920..aef6ff1
--- a/cups.spec
+++ b/cups.spec
@@@ -11,7 -11,7 +11,7 @@@ Summary: CUPS printing syste
  Name: cups
  Epoch: 1
  Version: 1.7.5
--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
@@@ -681,7 -650,10 +681,10 @@@ rm -f %{cups_serverbin}/backend/sm
  %{_mandir}/man5/ipptoolfile.5.gz
  
  %changelog
 -* Tue Aug 26 2014 Tim Waugh <twaugh at redhat.com> - 1:1.7.5-4
++* Tue Aug 26 2014 Tim Waugh <twaugh at redhat.com> - 1:1.7.5-5
+ - Use upstream patch for STR #4461.
+ 
 -* Wed Aug 20 2014 Tim Waugh <twaugh at redhat.com> - 1:1.7.5-3
 +* Wed Aug 20 2014 Tim Waugh <twaugh at redhat.com> - 1:1.7.5-4
  - Upstream patch for STR #4396, pre-requisite for STR #2913 patch.
  - Upstream patch for STR #2913 to limit Get-Jobs replies to 500 jobs
    (bug #421671).