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

[Tim Waugh]

commit d2a88b36baa78cc026e0e4910262e54b072624e2
Merge: 7d8f998 ef073d1
Author: Tim Waugh <twaugh at redhat.com>
Date:   Thu Apr 3 17:45:18 2014 +0100

    Merge branch 'f20'
    
    Conflicts:
    	cups.spec

 cups-str4386.patch |   12 ++++++++++++
 cups.spec          |   10 +++++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --cc cups.spec
index 1347aae,5dcd628..0236662
--- a/cups.spec
+++ b/cups.spec
@@@ -11,7 -11,7 +11,7 @@@ Summary: CUPS printing syste
  Name: cups
  Epoch: 1
  Version: 1.7.1
--Release: 9%{?dist}
++Release: 10%{?dist}
  License: GPLv2
  Group: System Environment/Daemons
  Url: http://www.cups.org/
@@@ -676,12 -657,10 +680,16 @@@ rm -f %{cups_serverbin}/backend/sm
  %{_mandir}/man5/ipptoolfile.5.gz
  
  %changelog
 -* Thu Apr  3 2014 Tim Waugh <twaugh at redhat.com> - 1:1.7.1-9
++* Thu Apr  3 2014 Tim Waugh <twaugh at redhat.com> - 1:1.7.1-10
+ - libcups: avoid race condition when sending IPP requests (STR #4386,
+   bug #1072952).
+ 
 +* Wed Apr 02 2014 Jiri Popelka <jpopelka at redhat.com> - 1:1.7.1-9
 +- New client subpackage containing command line client tools (bug #1002342).
 +- Removed unneeded Group tags.
 +- Removed 'Requires: /sbin/chkconfig'.
 +- Moved 'Provides: lpd' to lpd subpackage.
 +
  * Tue Mar 18 2014 Tim Waugh <twaugh at redhat.com> - 1:1.7.1-8
  - Removed patch for STR #4386 as it does not work and causes problems
    instead (bug #1077239).