[cups/f15: 2/2] Merge branch 'f14' into f15

[Jiří Popelka]

commit dd41b5b161efd965905ba9c2d8c0c3ddde627db8
Merge: ec3fa10 ccb8206
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Tue Jul 26 11:18:16 2011 +0200

    Merge branch 'f14' into f15

 .gitignore             |    1 +
 cups-snmp-quirks.patch |   18 +++++++++---------
 cups-str3875.patch     |   15 ---------------
 cups-str3880.patch     |   46 ----------------------------------------------
 cups.spec              |   17 +++++++----------
 sources                |    2 +-
 6 files changed, 18 insertions(+), 81 deletions(-)
---
diff --cc cups.spec
index 465482d,2912b19..a3579fc
--- a/cups.spec
+++ b/cups.spec
@@@ -60,28 -55,17 +60,26 @@@ Patch20: cups-res_init.patc
  Patch21: cups-filter-debug.patch
  Patch22: cups-uri-compat.patch
  Patch23: cups-cups-get-classes.patch
 -Patch24: cups-avahi.patch
 -Patch25: cups-str3382.patch
 -Patch26: cups-force-gnutls.patch
 -Patch27: cups-serialize-gnutls.patch
 -Patch28: cups-0755.patch
 -Patch29: cups-snmp-quirks.patch
 -Patch30: cups-hp-deviceid-oid.patch
 -Patch31: cups-dnssd-deviceid.patch
 -Patch32: cups-ricoh-deviceid-oid.patch
 -Patch33: cups-texttops-rotate-page.patch
 -Patch34: cups-polld-busy-loop.patch
 +Patch24: cups-str3382.patch
 +Patch25: cups-force-gnutls.patch
 +Patch26: cups-serialize-gnutls.patch
 +Patch27: cups-0755.patch
 +Patch28: cups-snmp-quirks.patch
 +Patch29: cups-hp-deviceid-oid.patch
 +Patch30: cups-dnssd-deviceid.patch
 +Patch31: cups-ricoh-deviceid-oid.patch
 +Patch32: cups-texttops-rotate-page.patch
 +Patch33: cups-usb-parallel.patch
 +Patch34: cups-str3535.patch
- Patch35: cups-str3875.patch
- Patch36: cups-polld-busy-loop.patch
- Patch37: cups-str3880.patch
++Patch35: cups-polld-busy-loop.patch
 +
 +Patch40: cups-avahi-1-config.patch
 +Patch41: cups-avahi-2-backend.patch
 +Patch42: cups-avahi-3-timeouts.patch
 +Patch43: cups-avahi-4-poll.patch
 +Patch44: cups-avahi-5-services.patch
 +
 +Patch45: cups-icc.patch
  
  Patch100: cups-lspp.patch
  
@@@ -286,29 -263,9 +284,25 @@@ module
  # Adjust texttops output to be in natural orientation (STR #3563).
  # This fixes page-label orientation when texttops is used in the
  # filter chain (bug #572338).
 -%patch33 -p1 -b .texttops-rotate-page
 +%patch32 -p1 -b .texttops-rotate-page
 +# Till's patch to fix USB-Parallel adapter cable problem (bug #624564).
 +%patch33 -p1 -b .usb-parallel
 +# Set the default RIPCache to 128m (STR #3535, bug #549901).
 +%patch34 -p1 -b .str3535
- # Fix SNMP supply level crasher (STR #3875, bug #719057).
- %patch35 -p1 -b .str3875
  # Avoid busy loop in cups-polld (bug #720921).
- %patch36 -p1 -b .polld-busy-loop
- # Don't delete job data files when restarted (STR #3880).
- %patch37 -p1 -b .str3880
 -%patch34 -p1 -b .polld-busy-loop
++%patch35 -p1 -b .polld-busy-loop
 +
 +# Avahi support:
 +# - discovery in the dnssd backend
 +# - service announcement in the scheduler
 +%patch40 -p1 -b .avahi-1-config
 +%patch41 -p1 -b .avahi-2-backend
 +%patch42 -p1 -b .avahi-3-timeouts
 +%patch43 -p1 -b .avahi-4-poll
 +%patch44 -p1 -b .avahi-5-services
 +
 +# ICC colord support.
 +%patch45 -p1 -b .icc
  
  %if %lspp
  # LSPP support.
@@@ -639,19 -574,22 +633,22 @@@ rm -rf $RPM_BUILD_ROO
  %{php_extdir}/phpcups.so
  
  %changelog
+ * Tue Jul 26 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.4.8-1
+ - 1.4.8
+ 
 -* Wed Jul 20 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-8
 +* Wed Jul 20 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-9
  - Don't delete job data files when restarted (STR #3880).
  
 -* Fri Jul 15 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-7
 +* Fri Jul 15 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-8
  - Ship an rpm macro for where to put driver executables.
  
 -* Wed Jul 13 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-6
 +* Wed Jul 13 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-7
  - Avoid busy loop in cups-polld (bug #720921).
  
 -* Thu Jul  7 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.4.7-5
 +* Thu Jul  7 2011 Jiri Popelka <jpopelka at redhat.com> 1:1.4.7-6
  - Fix SNMP supply level crasher (STR #3875, bug #719057).
  
 -* Thu Jul  7 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-4
 +* Thu Jul  7 2011 Tim Waugh <twaugh at redhat.com> 1:1.4.7-5
  - Undo last change which had no effect.  We already remove the .SILENT
    target from the Makefile as part of the build.