- Sync with svn5737.

cups-direct-usb.patch

@@ -1,6 +1,15 @@
 --- cups-1.2.1/backend/usb-unix.c.direct-usb	2006-07-04 17:50:28.000000000 +0100
 +++ cups-1.2.1/backend/usb-unix.c	2006-07-04 17:51:56.000000000 +0100
-@@ -327,12 +327,7 @@
+@@ -85,6 +85,8 @@
+     */
+ 
+     use_bc = strcasecmp(hostname, "Canon") != 0;
++    if (use_bc && !strncmp(uri, "usb:/dev/", 9))
++      use_bc = 0;
+ 
+     if ((device_fd = open_device(uri, &use_bc)) == -1)
+     {
+@@ -327,12 +329,7 @@
    if (!strncmp(uri, "usb:/dev/", 9))
  #ifdef __linux
    {

cups.spec

@@ -5,7 +5,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2.1
-Release: 18.1
+Release: 19
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -20,7 +20,7 @@ Source10: ncp.backend
 Source11: cups.conf
 Source12: cups.cron
 Source13: pdftops.conf
-Patch0: cups-svn5706.patch
+Patch0: cups-svn5737.patch
 Patch1: cups-1.1.15-initscript.patch
 Patch2: cups-no-gzip-man.patch
 Patch3: cups-1.1.16-system-auth.patch
@@ -28,7 +28,6 @@ Patch4: cups-multilib.patch
 Patch5: cups-ext.patch
 Patch6: cups-includeifexists.patch
 Patch7: cups-banners.patch
-Patch8: cups-str1705.patch
 Patch11: cups-serverbin-compat.patch
 Patch12: cups-locale.patch
 Patch16: cups-no-export-ssllibs.patch
@@ -115,7 +114,7 @@ lpd emulation.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .svn5706
+%patch0 -p1 -b .svn5737
 %patch1 -p1 -b .noinit
 %patch2 -p1 -b .no-gzip-man
 %patch3 -p1 -b .system-auth
@@ -123,7 +122,6 @@ lpd emulation.
 %patch5 -p1 -b .ext
 %patch6 -p1 -b .includeifexists
 %patch7 -p1 -b .banners
-%patch8 -p1 -b .str1705
 %patch11 -p1 -b .serverbin-compat
 %patch12 -p1 -b .locale
 %patch16 -p1 -b .no-export-ssllibs
@@ -235,9 +233,6 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/printers.conf
 touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/classes.conf
 touch $RPM_BUILD_ROOT%{_sysconfdir}/cups/client.conf
 
-# Ship an SSL directory
-mkdir $RPM_BUILD_ROOT%{_sysconfdir}/cups/ssl
-
 # Remove unshipped files.
 rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat?
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/cups.desktop
@@ -395,6 +390,9 @@ rm -rf $RPM_BUILD_ROOT
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Jul 14 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.1-19
+- Sync with svn5737.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1:1.2.1-18.1
 - rebuild