From d642dbcc305b609bac390a1d96dee34cbd46e504 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Fri, 4 Jan 2008 18:07:50 +0000
Subject: [PATCH] - Don't ship udev rules; instead, grant an ACL for group lp
 (bug #424331).

---
 hplip-udev-rules.patch | 31 -------------------------------
 hplip.spec             | 13 ++++++-------
 2 files changed, 6 insertions(+), 38 deletions(-)
 delete mode 100644 hplip-udev-rules.patch

diff --git a/hplip-udev-rules.patch b/hplip-udev-rules.patch
deleted file mode 100644
index 686c1ac..0000000
--- a/hplip-udev-rules.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -up hplip-2.7.10/data/rules/55-hpmud.rules.udev-rules hplip-2.7.10/data/rules/55-hpmud.rules
---- hplip-2.7.10/data/rules/55-hpmud.rules.udev-rules	2007-10-17 23:50:47.000000000 +0100
-+++ hplip-2.7.10/data/rules/55-hpmud.rules	2007-10-22 12:57:37.000000000 +0100
-@@ -1,21 +1,21 @@
- # Udev rules file for HP printer products.
- 
- ACTION!="add", GOTO="hpmud_rules_end"
--SUBSYSTEM=="ppdev", OWNER="lp", GROUP="lp", MODE="0666"
-+SUBSYSTEM=="ppdev", GROUP="lp", MODE="0664"
- SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="pid_test"
- SUBSYSTEM!="usb_device", GOTO="hpmud_rules_end"
- 
- LABEL="pid_test"
- 
- # Check for AiO products (0x03f0xx11).
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??11", OWNER="lp", GROUP="lp", MODE="0666"
-+SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??11", GROUP="lp", MODE="0664"
- # Check for Photosmart products (0x03f0xx02).
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??02", OWNER="lp", GROUP="lp", MODE="0666"
-+SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??02", GROUP="lp", MODE="0664"
- # Check for Business Inkjet products (0x03f0xx12).
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??12", OWNER="lp", GROUP="lp", MODE="0666"
-+SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??12", GROUP="lp", MODE="0664"
- # Check for Deskjet products (0x03f0xx04).
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??04", OWNER="lp", GROUP="lp", MODE="0666"
-+SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??04", GROUP="lp", MODE="0664"
- # Check for LaserJet products (0x03f0xx17).
--SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", OWNER="lp", GROUP="lp", MODE="0666"
-+SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", GROUP="lp", MODE="0664"
- 
- LABEL="hpmud_rules_end"
diff --git a/hplip.spec b/hplip.spec
index 3321ac3..c2bc81e 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -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 @@ Patch2: hplip-ljdot4.patch
 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 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # 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 @@ make install DESTDIR=%{buildroot} \
 
 # 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 @@ rm -rf %{buildroot}
 %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 @@ fi
 exit 0
 
 %changelog
+* Fri Jan  4 2008 Tim Waugh <twaugh@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