From a7119df5680f20a2317c2ce1cb6b8788efc928c3709c680f2e157358a9695416 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 22 Oct 2008 16:03:20 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hplip?expand=0&rev=35 --- change-udev-rules.diff | 21 ++++++++++++--------- hplip.changes | 7 +++++++ hplip.spec | 6 +++++- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/change-udev-rules.diff b/change-udev-rules.diff index 0511943..f7647ce 100644 --- a/change-udev-rules.diff +++ b/change-udev-rules.diff @@ -1,31 +1,34 @@ --- data/rules/55-hpmud.rules.orig 2008-09-09 13:42:51.000000000 +0200 -+++ data/rules/55-hpmud.rules 2008-09-09 13:45:05.000000000 +0200 ++++ data/rules/55-hpmud.rules 2008-10-21 15:30:31.000000000 +0200 @@ -1,22 +1,22 @@ # HPLIP udev rules file for HP printer and all-in-one products. ACTION!="add", GOTO="hpmud_rules_end" -SUBSYSTEM=="ppdev", OWNER="root", GROUP="lp", MODE="0666" +-SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="pid_test" +-SUBSYSTEM!="usb_device", GOTO="hpmud_rules_end" +SUBSYSTEM=="ppdev", OWNER="root", GROUP="lp", MODE="0664" - SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="pid_test" - SUBSYSTEM!="usb_device", GOTO="hpmud_rules_end" ++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="hpmud_pid_test" ++SUBSYSTEM!="usb", GOTO="hpmud_rules_end" - LABEL="pid_test" +-LABEL="pid_test" ++LABEL="hpmud_pid_test" # Check for AiO products (0x03f0xx11). -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??11", OWNER="root", GROUP="lp", MODE="0666", ENV{sane_hpaio}="yes" -+SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??11", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="??11", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes" # Check for Photosmart products (0x03f0xx02). -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??02", OWNER="root", GROUP="lp", MODE="0666", ENV{sane_hpaio}="yes" -+SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??02", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="??02", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes" # Check for Business Inkjet products (0x03f0xx12). -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??12", OWNER="root", GROUP="lp", MODE="0666", ENV{sane_hpaio}="yes" -+SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??12", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="??12", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes" # Check for Deskjet products (0x03f0xx04). -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??04", OWNER="root", GROUP="lp", MODE="0666", ENV{sane_hpaio}="yes" -+SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??04", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="??04", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes" # Check for LaserJet products (0x03f0xx17). -SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="0666", ENV{sane_hpaio}="yes" -+SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes" ++ATTR{idVendor}=="03f0", ATTR{idProduct}=="??17", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes" # If sane-bankends is installed add hpaio backend support to dll.conf if needed. ENV{sane_hpaio}=="yes", RUN+="/bin/sh -c 'grep -q ^#hpaio /etc/sane.d/dll.conf;if [ $$? -eq 0 ];then sed -i -e s/^#hpaio/hpaio/ /etc/sane.d/dll.conf;else grep -q ^hpaio /etc/sane.d/dll.conf;if [ $$? -ne 0 ];then echo hpaio >>/etc/sane.d/dll.conf;fi;fi'" diff --git a/hplip.changes b/hplip.changes index b031c3f..f81582d 100644 --- a/hplip.changes +++ b/hplip.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Oct 21 14:49:39 CEST 2008 - jsmeix@suse.de + +- Changed change-udev-rules.diff to jump to the end + if SUBSYSTEM!="usb" and replaced SYSFS by ATTR + (see Novell/Suse Bugzilla bnc#436085). + ------------------------------------------------------------------- Tue Sep 16 08:35:58 CEST 2008 - jsmeix@suse.de diff --git a/hplip.spec b/hplip.spec index 5ab2383..4f36b11 100644 --- a/hplip.spec +++ b/hplip.spec @@ -25,7 +25,7 @@ Summary: HP's Printing, Scanning, and Faxing Software # x.y.m : x = major release number, y = year (eg: 6 = 2006), m = month (eg: 6a = second release in June) # Official releases have a 3 digit number and release candidates have a 4 digit number: x.y.m.rc Version: 2.8.7 -Release: 2 +Release: 3 Group: Hardware/Printing License: BSD 3-Clause; GPL v2 or later; X11/MIT Url: http://hpinkjet.sourceforge.net/ @@ -480,6 +480,10 @@ exit 0 %{_libdir}/libhpmud.* %changelog +* Tue Oct 21 2008 jsmeix@suse.de +- Changed change-udev-rules.diff to jump to the end + if SUBSYSTEM!="usb" and replaced SYSFS by ATTR + (see Novell/Suse Bugzilla bnc#436085). * Tue Sep 16 2008 jsmeix@suse.de - Added "Recommends: hplip" to hplip-hpijs because when only hplip-hpijs is there, it should tell the dependency resolver