[cups: 6/6] Merge branch 'f19'

[Tim Waugh]

commit b99406b9ca0ab7b5307c4d9e79ca1e409dbf75a6
Merge: 9663c6c 5f13149
Author: Tim Waugh <twaugh at redhat.com>
Date:   Tue Jun 4 11:45:27 2013 +0100

    Merge branch 'f19'

 cups-enum-all.patch |   17 +++++++++++++++++
 cups.spec           |   24 ++++++++++++++++++------
 2 files changed, 35 insertions(+), 6 deletions(-)
---
diff --cc cups.spec
index f2dfefa,2c281fd..3d8e69d
--- a/cups.spec
+++ b/cups.spec
@@@ -13,8 -10,8 +13,8 @@@
  Summary: CUPS printing system
  Name: cups
  Epoch: 1
 -Version: 1.6.2
 -Release: 8%{?dist}
 +Version: 1.7
- Release: 0.3.%{prever}%{?dist}
++Release: 0.4.%{prever}%{?dist}
  License: GPLv2
  Group: System Environment/Daemons
  Url: http://www.cups.org/
@@@ -58,7 -55,8 +58,8 @@@ Patch24: cups-ricoh-deviceid-oid.patc
  Patch25: cups-systemd-socket.patch
  Patch26: cups-lpd-manpage.patch
  Patch27: cups-avahi-address.patch
 -Patch28: cups-usblp-quirks.patch
 +Patch28: cups-17b1-va_list.patch
+ Patch29: cups-enum-all.patch
  
  Patch100: cups-lspp.patch
  
@@@ -228,9 -226,11 +229,10 @@@ Sends IPP requests to the specified UR
  %patch26 -p1 -b .lpd-manpage
  # Use IP address when resolving DNSSD URIs (bug #948288).
  %patch27 -p1 -b .avahi-address
- 
 -# More USB quirks for the libusb-based backend (STR #4311).
 -# Fixed in 1.6.3
 -%patch28 -p1 -b .quirks
 +# do not apply unary exclamation mark to va_list (bug #957737).
 +%patch28 -p1 -b .va_list
+ # Return from cupsEnumDests() once all records have been returned.
+ %patch29 -p1 -b .enum-all
  
  %if %lspp
  # LSPP support.
@@@ -628,16 -632,18 +634,22 @@@ rm -f %{cups_serverbin}/backend/sm
  %{_mandir}/man5/ipptoolfile.5.gz
  
  %changelog
 -* Tue Jun  4 2013 Tim Waugh <twaugh at redhat.com> - 1:1.6.2-8
++* Tue Jun  4 2013 Tim Waugh <twaugh at redhat.com> - 1:1.7-0.4.b1
+ - Return from cupsEnumDests() once all records have been returned.
+ 
 -* Thu May 23 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.6.2-7
 -- Added more USB quirks for the libusb-based backend (STR #4311)
 -
 -* Thu May 23 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.6.2-6
++* Thu May 23 2013 Jiri Popelka <jpopelka at redhat.com>
+ - don't ship Russian web templates because they're broken (#960571, STR #4310)
+ 
 -* Wed May 15 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.6.2-5
 +* Wed May 15 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.7-0.3.b1
  - move cups/ppdc/ to filesystem subpackage
  
 +* Mon Apr 29 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.7-0.2.b1
 +- Do not apply unary exclamation mark to va_list (bug #957737).
 +
 +* Fri Apr 19 2013 Jiri Popelka <jpopelka at redhat.com> - 1:1.7-0.1.b1
 +- 1.7b1
 +- use _tmpfilesdir macro
 +
  * Wed Apr 10 2013 Tim Waugh <twaugh at redhat.com>
  - cups-dbus-utf.patch: now that the scheduler only accepts valid UTF-8
    strings for job-name, there's no need to validate it as UTF-8 in the