rpms/hplip/devel hplip.spec, 1.165, 1.166 hplip-udev-rules.patch, 1.5, NONE

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17998

Modified Files:
	hplip.spec 
Removed Files:
	hplip-udev-rules.patch 
Log Message:
* Fri Jan  4 2008 Tim Waugh <twaugh at redhat.com> 2.7.10-2
- Don't ship udev rules; instead, grant an ACL for group lp (bug #424331).



Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- hplip.spec	7 Dec 2007 15:37:52 -0000	1.165
+++ hplip.spec	4 Jan 2008 18:07:50 -0000	1.166
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 2.7.10
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -19,7 +19,6 @@
 Patch3: hplip-quiet.patch
 Patch4: hplip-marker-supply.patch
 Patch5: hplip-libm.patch
-Patch6: hplip-udev-rules.patch
 Patch8: hplip-libsane.patch
 Patch9: hplip-media-empty.patch
 Patch11: hplip-unload-traceback.patch
@@ -108,9 +107,6 @@
 # libhpip should link against libm (bug #197599).
 %patch5 -p1 -b .libm
 
-# Fix the udev rules file (bug #248740).
-%patch6 -p1 -b .udev-rules
-
 # Link libsane-hpaio against libsane (bug #234813).
 %patch8 -p1 -b .libsane
 
@@ -141,7 +137,8 @@
 
 # Remove unpackaged files
 rm -rf	%{buildroot}%{_sysconfdir}/sane.d \
-	%{buildroot}%{_docdir}
+	%{buildroot}%{_docdir} \
+	%{_sysconfdir}/udev/rules.d/*
 
 rm -f	%{buildroot}%{_bindir}/foomatic-rip \
 	%{buildroot}%{_libdir}/cups/filter/foomatic-rip \
@@ -175,7 +172,6 @@
 %files
 %defattr(-,root,root)
 %doc COPYING doc/*
-%{_sysconfdir}/udev/rules.d/*
 %{_datadir}/hal/fdi/policy/10osvendor/10-hplip.fdi
 %dir %{_sysconfdir}/hp
 %config(noreplace) %{_sysconfdir}/hp/hplip.conf
@@ -282,6 +278,9 @@
 exit 0
 
 %changelog
+* Fri Jan  4 2008 Tim Waugh <twaugh at redhat.com> 2.7.10-2
+- Don't ship udev rules; instead, grant an ACL for group lp (bug #424331).
+
 * Fri Dec 07 2007 Release Engineering <rel-eng at fedoraproject dot org> - 2.7.10-2
 - Rebuild for deps
 


--- hplip-udev-rules.patch DELETED ---