- 3.12.4

- udev rules moved to proper place in /lib
- import USB ids in udev rules

Changed files:
    hplip-udev-rules.patch -> 1.1
    hplip.spec -> 1.95

diff --git a/hplip-udev-rules.patch b/hplip-udev-rules.patch
new file mode 100644 (file)
index 0000000..46fd00a
--- /dev/null
+++ b/hplip-udev-rules.patch
@@ -0,0 +1,23 @@
+diff -up hplip-3.12.4/data/rules/56-hpmud_support.rules.udev-rules hplip-3.12.4/data/rules/56-hpmud_support.rules
+--- hplip-3.12.4/data/rules/56-hpmud_support.rules.udev-rules  2012-04-10 10:34:19.000000000 +0200
++++ hplip-3.12.4/data/rules/56-hpmud_support.rules     2012-04-12 12:31:05.120241342 +0200
+@@ -6,6 +6,7 @@ SUBSYSTEM!="usb_device", GOTO="hpmud_rul
+ 
+ LABEL="pid_test"
+ 
++ENV{ID_USB_INTERFACES}=="", IMPORT{program}="usb_id --export %p"
+ # Check for LaserJet products (0x03f0xx17).
+ ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="??17", ENV{hp_model}="$attrs{product}", ENV{hp_test}="yes"
+ # Check for LaserJet products (0x03f0xx2a).
+diff -up hplip-3.12.4/Makefile.in.udev-rules hplip-3.12.4/Makefile.in
+--- hplip-3.12.4/Makefile.in.udev-rules        2012-04-10 10:38:51.000000000 +0200
++++ hplip-3.12.4/Makefile.in   2012-04-12 12:36:40.806539034 +0200
+@@ -4119,7 +4119,7 @@ cups_drv = prnt/drv/hpcups.drv
+ @HPLIP_BUILD_TRUE@hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"
+ 
+ # hpmud.rules
+-@HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d
++@HPLIP_BUILD_TRUE@rulesdir = /lib/udev/rules.d
+ @HPLIP_BUILD_TRUE@dist_rules_DATA = data/rules/56-hpmud_support.rules \
+ @HPLIP_BUILD_TRUE@    data/rules/86-hpmud_plugin.rules \
+ @HPLIP_BUILD_TRUE@    data/rules/56-hpmud_add_printer.rules \

diff --git a/hplip.spec b/hplip.spec
index a493ee4e3cd72a388d2bc02f3028ede8e4232ff9..7b1d8577d71613ab8789df9bd0a5b0fb51309a00 100644 (file)
--- a/hplip.spec
+++ b/hplip.spec
@@ -10,17 +10,18 @@
 Summary:       Hewlett-Packard Linux Imaging and Printing suite - printing and scanning using HP devices
 Summary(pl.UTF-8):     Narzędzia Hewlett-Packard Linux Imaging and Printing - drukowanie i skanowanie przy użyciu urządzeń HP
 Name:          hplip
-Version:       3.12.2
+Version:       3.12.4
 Release:       1
 License:       BSD (hpijs), MIT (low-level scanning and printing code), GPL v2 (the rest)
 Group:         Applications/System
 Source0:       http://downloads.sourceforge.net/hplip/%{name}-%{version}.tar.gz
-# Source0-md5: 6572ec99c1818cc92d97b793bff08633
+# Source0-md5: a063f76aa47edab55a3f31ff2558df07
 Patch0:                %{name}-desktop.patch
 Patch1:                unresolved.patch
 Patch2:                pld-distro.patch
 Patch3:                %{name}-binary-fixup.patch
 Patch4:                %{name}-build.patch
+Patch5:                %{name}-udev-rules.patch
 URL:           http://hplipopensource.com/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -160,6 +161,7 @@ urządzenia HP AiO.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %{__sed} -i -e's,^#!/usr/bin/env python$,#!/usr/bin/python,' *.py
 %{__sed} -i -e 's#test -d /usr/share/polkit-1#true#' configure.in
@@ -300,9 +302,9 @@ fi
 %attr(755,root,root) %{py_sitedir}/scanext.so
 %dir %{_sysconfdir}/hp
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/hp/hplip.conf
-/etc/udev/rules.d/40-hplip.rules
-/etc/udev/rules.d/56-hpmud_support.rules
-/etc/udev/rules.d/86-hpmud_plugin.rules
+/lib/udev/rules.d/40-hplip.rules
+/lib/udev/rules.d/56-hpmud_support.rules
+/lib/udev/rules.d/86-hpmud_plugin.rules
 /etc/dbus-1/system.d/com.hp.hplip.conf
 %{_datadir}/dbus-1/system-services/com.hp.hplip.service
 %{_datadir}/polkit-1/actions/com.hp.hplip.policy