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

[Tim Waugh]

commit b11b66403db8f52c1165a3be5d6205c5c4b5d17b
Merge: 5ab983c d42a6fe
Author: Tim Waugh <twaugh at redhat.com>
Date:   Mon Jan 10 16:30:43 2011 +0000

    Merge branch 'f14'

 cups-EAI_AGAIN.patch       |   12 ------------
 cups-res_init.patch        |   24 +++++++++++++++++++-----
 cups-usb-buffer-size.patch |   22 ++++++++++++++++++++++
 cups.spec                  |   13 ++++++++-----
 4 files changed, 49 insertions(+), 22 deletions(-)
---
diff --cc cups.spec
index 52d3870,547c586..be6fb0c
--- a/cups.spec
+++ b/cups.spec
@@@ -67,7 -67,7 +66,8 @@@ Patch36: cups-ricoh-deviceid-oid.patc
  Patch37: cups-texttops-rotate-page.patch
  Patch38: cups-autotype-crash.patch
  Patch39: cups-str3754.patch
 -Patch40: cups-usb-buffer-size.patch
 +Patch40: cups-avahi.patch
++Patch41: cups-usb-buffer-size.patch
  
  Patch100: cups-lspp.patch
  
@@@ -281,9 -277,8 +279,10 @@@ 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).
 -%patch40 -p1 -b .usb-buffer-size
++%patch41 -p1 -b .usb-buffer-size
  
  %if %lspp
  # LSPP support.