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

[Tim Waugh]

commit 262db768e0cd73621f9a9c89e8ee7cf1e8eef89d
Merge: 38b9a80 37f28ef
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Aug 26 14:59:47 2014 +0100

    Merge branch 'f21'

 cups-str4461.patch |  111 +++++++++++++++++++++++++++++++++++++++++++---------
 cups.spec          |    5 ++-
 2 files changed, 96 insertions(+), 20 deletions(-)
---
diff --cc cups.spec
index fd3b5da,aef6ff1..671da3b
--- a/cups.spec
+++ b/cups.spec
@@@ -675,10 -681,10 +675,13 @@@ 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-5
+ - Use upstream patch for STR #4461.
+ 
  * Wed Aug 20 2014 Tim Waugh <twaugh at redhat.com> - 1:1.7.5-4
 +- Removed old one-off trigger now it's no longer needed.
 +- Run systemd postun script for path and socket unit files as well as
 +  the main service unit file.
  - 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).