[cups/f15: 2/2] Merge branch 'f14' into f15
Tim Waugh
twaugh at fedoraproject.org
Wed Jul 13 11:19:15 UTC 2011
commit 6d47608f7b0b2782445736bec4808a828bb7abe2
Merge: f0218f3 a8d5377
Author: Tim Waugh <twaugh at redhat.com>
Date: Wed Jul 13 11:17:30 2011 +0100
Merge branch 'f14' into f15
cups-polld-busy-loop.patch | 12 ++++++++++++
cups.spec | 8 +++++++-
2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --cc cups.spec
index f40594c,bc24254..f80bbce
--- a/cups.spec
+++ b/cups.spec
@@@ -13,7 -8,7 +13,7 @@@
Summary: Common Unix Printing System
Name: cups
Version: 1.4.7
--Release: 6%{?dist}
++Release: 7%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@@ -59,26 -54,18 +59,27 @@@ 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-str3875.patch
-Patch35: 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
+
+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
@@@ -283,25 -263,11 +284,27 @@@ 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).
-%patch34 -p1 -b .str3875
+%patch35 -p1 -b .str3875
+ # Avoid busy loop in cups-polld (bug #720921).
-%patch35 -p1 -b .polld-busy-loop
++%patch36 -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.
@@@ -627,10 -571,13 +630,13 @@@ rm -rf $RPM_BUILD_ROO
%{php_extdir}/phpcups.so
%changelog
-* 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.
More information about the scm-commits
mailing list