[cups: 3/3] Merge branch 'f14'

[Jiří Popelka]

commit 1b27d5abd18d7fcf4d2971ba25513bdf983f06ff
Merge: afa11f7 b6d77d5
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Thu Feb 10 10:46:23 2011 +0100

    Merge branch 'f14'

 cups-usb-buffer-size.patch |   22 ----------------------
 cups.spec                  |   18 +++++++++---------
 2 files changed, 9 insertions(+), 31 deletions(-)
---
diff --cc cups.spec
index 50f55a4,7dbf9fa..4fc4203
--- a/cups.spec
+++ b/cups.spec
@@@ -13,7 -8,7 +13,7 @@@
  Summary: Common Unix Printing System
  Name: cups
  Version: 1.4.6
- Release: 9%{?dist}
 -Release: 4%{?dist}
++Release: 10%{?dist}
  License: GPLv2
  Group: System Environment/Daemons
  Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@@ -71,10 -67,6 +71,9 @@@ Patch36: cups-ricoh-deviceid-oid.patc
  Patch37: cups-texttops-rotate-page.patch
  Patch38: cups-autotype-crash.patch
  Patch39: cups-str3754.patch
 +Patch40: cups-avahi.patch
- Patch41: cups-usb-buffer-size.patch
- Patch42: cups-icc.patch
- Patch43: cups-usb-parallel.patch
++Patch41: cups-icc.patch
++Patch42: cups-usb-parallel.patch
  
  Patch100: cups-lspp.patch
  
@@@ -288,14 -276,6 +287,12 @@@ module
  %patch38 -p1 -b .autotype-crash
  # Don't crash when job queued for printer that times out (bug #660604).
  %patch39 -p1 -b .str3754
 +# Avahi support in the dnssd backend.
 +%patch40 -p1 -b .avahi
- # Use a smaller buffer when writing to USB devices (bug #617208).
- %patch41 -p1 -b .usb-buffer-size
 +# ICC colord support.
- %patch42 -p1 -b .icc
++%patch41 -p1 -b .icc
 +# Till's patch to fix USB-Parallel adapter cable problem (bug #624564).
- %patch43 -p1 -b .usb-parallel
++%patch42 -p1 -b .usb-parallel
  
  %if %lspp
  # LSPP support.
@@@ -611,31 -573,15 +608,34 @@@ rm -rf $RPM_BUILD_ROO
  %{php_extdir}/phpcups.so
  
  %changelog
 -* Thu Feb 10 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.4.6-4
++* Thu Feb 10 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.4.6-10
+ - Remove testing cups-usb-buffer-size.patch (bug #661814).
+ 
 -* Tue Jan 18 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.6-3
 +* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.4.6-9
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 +
 +* Tue Feb 01 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.4.6-8
 +- Use Till's patch to fix USB-Parallel adapter cable problem (bug #624564).
 +
 +* Tue Jan 25 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.6-7
 +- Some fixes for the AvahiClient callback (bug #672143).
 +
 +* Tue Jan 18 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.6-6
  - Don't use --enable-pie configure option as it has been removed and
    is now assumed.  See STR #3691.
  
 +* Fri Jan 14 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.6-5
 +- ICC colord support.
 +
 +* Wed Jan 12 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.6-4
 +- Properly separated serverbin-compat and lspp patches.
 +- Updated ICC patch (still not yet applied).
 +
 +* Tue Jan 11 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.6-3
 +- Build requires automake for avahi support.
 +
  * Mon Jan 10 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.6-2
- - Use a smaller buffer when writing to USB devices (bug #617208).
+ - Use a smaller buffer when writing to USB devices (bug #661814).
  - Handle EAI_NONAME when resolving hostnames (bug #617208).
  
  * Fri Jan 07 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.4.6-1