- Tweak to allow 'usb:/dev/usb/lp0'-style URIs again.

cups-direct-usb.patch

@@ -0,0 +1,11 @@
+--- cups-1.2rc1/backend/usb-unix.c.direct-usb	2006-04-04 15:57:47.000000000 +0100
++++ cups-1.2rc1/backend/usb-unix.c	2006-04-04 15:58:26.000000000 +0100
+@@ -431,7 +431,7 @@
+ 
+   if (!strncmp(uri, "usb:/dev/", 9))
+ #ifdef __linux
+-    return (-1); /* Do not allow direct devices anymore */
++    return (open(uri + 4, O_RDWR | O_EXCL));
+   else if (!strncmp(uri, "usb://", 6))
+   {
+    /*

cups.spec

@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.2
-Release: 0.2.%{beta}.5
+Release: 0.2.%{beta}.6
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2
@@ -40,6 +40,7 @@ Patch16: cups-pie.patch
 Patch17: cups-1.1.19-no_rpath.patch
 Patch18: cups-language.patch
 Patch19: cups-gnome.patch
+Patch20: cups-direct-usb.patch
 Patch22: cups-dest-cache-v2.patch
 Patch24: cups-maxlogsize.patch
 Patch28: cups-no-propagate-ipp-port.patch
@@ -133,6 +134,7 @@ lpd emulation.
 %patch17 -p1 -b .no_rpath
 %patch18 -p1 -b .language
 %patch19 -p1 -b .gnome
+%patch20 -p1 -b .direct-usb
 %patch22 -p1 -b .dest-cache-v2
 %patch24 -p1 -b .maxlogsize
 %patch28 -p1 -b .no-propagate-ipp-port
@@ -383,6 +385,9 @@ rm -rf $RPM_BUILD_ROOT
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Tue Apr  4 2006 Tim Waugh <twaugh@redhat.com> 1:1.2-0.2.rc1.6
+- Tweak to allow 'usb:/dev/usb/lp0'-style URIs again.
+
 * Sun Apr  2 2006 Tim Waugh <twaugh@redhat.com> 1:1.2-0.2.rc1.5
 - Backported svn 5365:5366 change for mutex-protected stringpool (STR #1530).