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

[Tim Waugh]

commit 877241921a1597fe7a678702293a515b29bf9856
Merge: 476c560 b14fb49
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Nov 28 16:53:54 2013 +0000

    Merge branch 'f20'
    
    Conflicts:
    	cups.spec

 cups-usb-timeout.patch |   30 ++++++++++++++++++++++++++++++
 cups.spec              |    8 +++++++-
 2 files changed, 37 insertions(+), 1 deletions(-)
---
diff --cc cups.spec
index b525038,62700c1..b68fe3b
--- a/cups.spec
+++ b/cups.spec
@@@ -11,7 -11,7 +11,7 @@@ Summary: CUPS printing syste
  Name: cups
  Epoch: 1
  Version: 1.7.0
--Release: 6%{?dist}
++Release: 7%{?dist}
  License: GPLv2
  Group: System Environment/Daemons
  Url: http://www.cups.org/
@@@ -55,8 -55,9 +55,9 @@@ Patch24: cups-ricoh-deviceid-oid.patc
  Patch25: cups-systemd-socket.patch
  Patch26: cups-lpd-manpage.patch
  Patch27: cups-avahi-address.patch
+ Patch28: cups-usb-timeout.patch
  Patch29: cups-enum-all.patch
 -Patch30: cups-stringpool-setprinterattr.patch
 +Patch30: cups-stringpool-rdar15382819.patch
  Patch31: cups-dymo-deviceid.patch
  Patch32: cups-freebind.patch
  Patch33: cups-no-gcry.patch
@@@ -655,12 -658,12 +658,15 @@@ rm -f %{cups_serverbin}/backend/sm
  %{_mandir}/man5/ipptoolfile.5.gz
  
  %changelog
 -* Thu Nov 28 2013 Tim Waugh <twaugh at redhat.com> - 1:1.7.0-6
++* Thu Nov 28 2013 Tim Waugh <twaugh at redhat.com> - 1:1.7.0-7
+ - Prevent USB timeouts causing incorrect print output (bug #1026914).
+ 
 -* Thu Nov 14 2013 Tim Waugh <twaugh at redhat.com> - 1:1.7.0-5
 +* Thu Nov 14 2013 Tim Waugh <twaugh at redhat.com> - 1:1.7.0-6
  - Avoid stale lockfile in dbus notifier (bug #1026949).
  
 +* Thu Nov  7 2013 Tim Waugh <twaugh at redhat.com> - 1:1.7.0-5
 +- Use upstream patch for stringpool corruption issue (bug #974048).
 +
  * Mon Nov  4 2013 Tim Waugh <twaugh at redhat.com> - 1:1.7.0-4
  - Adjusted commented out default for SyncOnClose in cups-files.conf.