[hplip] Really move udev rules to /lib/udev/rules.d (bug #748208).

Jiří Popelka jpopelka at fedoraproject.org
Mon Oct 24 12:37:50 UTC 2011


commit 275aca366526b8ea183785c497a671a3101b4f52
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Mon Oct 24 14:33:12 2011 +0200

    Really move udev rules to /lib/udev/rules.d (bug #748208).

 hplip-udev-rules.patch |   12 ++++++++++++
 hplip.spec             |    4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/hplip-udev-rules.patch b/hplip-udev-rules.patch
index afc61ea..6b79b06 100644
--- a/hplip-udev-rules.patch
+++ b/hplip-udev-rules.patch
@@ -15,3 +15,15 @@ diff -up hplip-3.11.7/data/rules/56-hpmud_support.rules.udev-rules hplip-3.11.7/
  ENV{hp_test}=="yes", RUN+="/bin/sh -c '/usr/bin/hp-mkuri -c &'"
  
  LABEL="hpmud_rules_end"
+diff -up hplip-3.11.10/Makefile.in.udev-rules hplip-3.11.10/Makefile.in
+--- hplip-3.11.10/Makefile.in.udev-rules	2011-10-02 05:11:49.000000000 +0200
++++ hplip-3.11.10/Makefile.in	2011-10-24 14:23:17.336002785 +0200
+@@ -4093,7 +4093,7 @@ cups_drv = prnt/drv/hpcups.drv
+ @HPLIP_BUILD_TRUE at hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"
+ 
+ # hpmud.rules
+- at HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d
++ at HPLIP_BUILD_TRUE@rulesdir = /lib/udev/rules.d
+ @HPLIP_BUILD_TRUE at dist_rules_DATA = data/rules/56-hpmud_support.rules \
+ @HPLIP_BUILD_TRUE@	$(am__append_2) $(am__append_3)
+ @HPLIP_BUILD_TRUE at halpredir = /usr/share/hal/fdi/preprobe/10osvendor
diff --git a/hplip.spec b/hplip.spec
index 11096cd..3683fb3 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -187,8 +187,8 @@ mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs}
 # directly (bug #552572).
 %patch6 -p1 -b .mucks-with-spooldir
 
-# Removed SYSFS use in udev rules and actually made them work
-# (bug #560754).
+# Removed SYSFS use in udev rules and actually made them work (bug #560754).
+# Move udev rules to /lib/udev/rules.d (bug #748208).
 %patch7 -p1 -b .udev-rules
 
 # Retry when connecting to device fails (bug #532112).


More information about the scm-commits mailing list