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

[Tim Waugh]

commit 299d5dde473e5433bce9ad2a13e89163f10a2e6a
Merge: 6865fda 2efac28
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Oct 22 09:06:14 2014 +0100

    Merge branch 'f21'

 cups.spec |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
---
diff --cc cups.spec
index 9908c0f,56290ff..d6392b7
--- 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: 12%{?dist}
 +Version: 2.0.0
- Release: 7%{?dist}
++Release: 8%{?dist}
  License: GPLv2
  Url: http://www.cups.org/
  Source: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2
@@@ -65,7 -65,11 +65,8 @@@ 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
 -Patch43: cups-str4496.patch
 +Patch39: cups-str4500.patch
++Patch40: cups-str4496.patch
  
  Patch100: cups-lspp.patch
  
@@@ -262,9 -268,19 +263,12 @@@ 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
+ # Upstream fix for cupsd crash on restart when colord not available
+ # (STR #4496).
 -%patch43 -p1 -b .str4496
++%patch40 -p1 -b .str4496
  
  %if %lspp
  # LSPP support.
@@@ -610,13 -688,17 +614,17 @@@ rm -f %{cups_serverbin}/backend/sm
  %{_mandir}/man5/ipptoolfile.5.gz
  
  %changelog
 -* Wed Oct 22 2014 Tim Waugh <twaugh at redhat.com> - 1:1.7.5-12
++* Wed Oct 22 2014 Tim Waugh <twaugh at redhat.com> - 1:2.0.0-8
+ - Upstream fix for cupsd crash on restart when colord not available
+ - (STR #4496).
+ 
 -* Sat Oct 18 2014 Tim Waugh <twaugh at redhat.com> - 1:1.7.5-11
 +* Sat Oct 18 2014 Tim Waugh <twaugh at redhat.com> - 1:2.0.0-7
  - Fix for last fix (bug #1153660, bug #1154284).
  
 -* Thu Oct 16 2014 Tim Waugh <twaugh at redhat.com> - 1:1.7.5-10
 -- Start cups.service after network.target (bug #1153660).
 +* Thu Oct 16 2014 Tim Waugh <twaugh at redhat.com> - 1:2.0.0-6
 +- Start cupsd systemd service after network.target (bug #1153660).
  
 -* 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).