rpms/cups/F-11 cups-libusb.rules,NONE,1.1 cups.spec,1.496,1.497

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6917

Modified Files:
	cups.spec 
Added Files:
	cups-libusb.rules 
Log Message:
* Thu Aug  6 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.13
- Ship udev rules to allow libusb to access printer devices.



--- NEW FILE cups-libusb.rules ---
# Allow the lp group to read and write raw USB devices for printers.
# This is required for the CUPS usb backend when built with libusb
# support.
ACTION=="add", SUBSYSTEM=="usb", \
  ATTR{bInterfaceClass}=="07", ATTR{bInterfaceSubClass}=="01", \
  DEVTYPE="usb_device", RUN+="/usr/bin/setfacl -m g:lp:rw /dev/%P"


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.496
retrieving revision 1.497
diff -u -p -r1.496 -r1.497
--- cups.spec	4 Aug 2009 12:33:00 -0000	1.496
+++ cups.spec	6 Aug 2009 13:21:18 -0000	1.497
@@ -16,6 +16,7 @@ Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
 Source1: cups.init
 Source2: cupsprinter.png
+Source3: cups-libusb.rules
 Source4: pstopdf
 Source5: cups-lpd
 Source6: pstoraster
@@ -120,6 +121,9 @@ Requires: portreserve
 
 Requires: poppler-utils
 
+# We ship udev rules.
+Requires: udev
+
 %package devel
 Summary: Common Unix Printing System - development environment
 Group: Development/Libraries
@@ -340,6 +344,10 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/icons
 extension=phpcups.so
 __EOF__
 
+# Install the udev rules.
+%{__mkdir_p} %{buildroot}%{_sysconfdir}/udev/rules.d
+install -m644 %{SOURCE3} \
+	%{buildroot}%{_sysconfdir}/udev/rules.d/70-cups-libusb.rules
 
 %post
 /sbin/chkconfig --del cupsd 2>/dev/null || true # Make sure old versions aren't there anymore
@@ -404,6 +412,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc LICENSE.txt README.txt CREDITS.txt CHANGES.txt
+%{_sysconfdir}/udev/rules.d/70-cups-libusb.rules
 %dir %attr(0755,root,lp) /etc/cups
 %dir %attr(0755,root,lp) /var/run/cups
 %dir %attr(0511,lp,sys) /var/run/cups/certs
@@ -513,7 +522,8 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
-* Tue Aug  4 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.13
+* Thu Aug  6 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.13
+- Ship udev rules to allow libusb to access printer devices.
 - Fixed duplex test pages (bug #514898, STR #3277).
 - Removed temporary snmp option from socket backend.