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

[Tim Waugh]

commit b6a9026c2bf7450359b37a6c8c030b39cd626cd7
Merge: dcfab8a ad38ac5
Author: Tim Waugh <twaugh at redhat.com>
Date:   Mon Sep 1 13:07:02 2014 +0100

    Merge branch 'f20' into f21

 cups-str4475.patch |   24 ++++++++++++++++++++++++
 cups.spec          |    8 +++++++-
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --cc cups.spec
index 6b95648,25e701f..cb5f014
--- 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: 6%{?dist}
++Release: 7%{?dist}
  License: GPLv2
  Url: http://www.cups.org/
  Source: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2
@@@ -681,13 -653,16 +684,16 @@@ rm -f %{cups_serverbin}/backend/sm
  %{_mandir}/man5/ipptoolfile.5.gz
  
  %changelog
 -* Mon Sep  1 2014 Tim Waugh <twaugh at redhat.com> - 1:1.7.5-6
++* Mon Sep  1 2014 Tim Waugh <twaugh at redhat.com> - 1:1.7.5-7
+ - Fix icon display in web interface during server restart (STR #4475).
+ 
 -* Mon Sep  1 2014 Tim Waugh <twaugh at redhat.com> - 1:1.7.5-5
 +* Mon Sep  1 2014 Tim Waugh <twaugh at redhat.com> - 1:1.7.5-6
  - More STR #4461 fixes from upstream.
  
 -* 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).