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

[Tim Waugh]

commit 5577ebfef276f72fbc6ba00c71398503142e82d5
Merge: ffa3ffe 93ba33e
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Aug 20 17:25:28 2014 +0100

    Merge branch 'f20' into f21
    
    Conflicts:
    	cups.spec

 cups-str2913.patch |  399 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 cups-str4396.patch |  271 +++++++++++++++++++++++++++++++++++
 cups.spec          |   14 ++-
 3 files changed, 683 insertions(+), 1 deletions(-)
---
diff --cc cups.spec
index 49bcee0,0991033..a06238b
--- 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: 3%{?dist}
++Release: 4%{?dist}
  License: GPLv2
  Url: http://www.cups.org/
  Source: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2
@@@ -674,9 -650,11 +681,14 @@@ rm -f %{cups_serverbin}/backend/sm
  %{_mandir}/man5/ipptoolfile.5.gz
  
  %changelog
 -* 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).
+ 
 +* Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.7.5-3
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 +
  * Mon Aug 11 2014 Tim Waugh <twaugh at redhat.com> - 1:1.7.5-2
  - Fix conf/log file reading for authenticated users (STR #4461).