packages: hplip/hplip.spec, hplip/hplip-udev-rules.patch (NEW)=?UTF-8?Q?=20?=- 3.12.4 - u...

[baggins]

Author: baggins                      Date: Wed Apr 25 09:40:04 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 3.12.4
- udev rules moved to proper place in /lib
- import USB ids in udev rules

---- Files affected:
packages/hplip:
   hplip.spec (1.94 -> 1.95) , hplip-udev-rules.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/hplip/hplip.spec
diff -u packages/hplip/hplip.spec:1.94 packages/hplip/hplip.spec:1.95
--- packages/hplip/hplip.spec:1.94	Thu Feb  9 15:58:58 2012
+++ packages/hplip/hplip.spec	Wed Apr 25 11:39:59 2012
@@ -11,17 +11,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
@@ -161,6 +162,7 @@
 %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
@@ -301,9 +303,9 @@
 %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
@@ -384,6 +386,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.95  2012/04/25 09:39:59  baggins
+- 3.12.4
+- udev rules moved to proper place in /lib
+- import USB ids in udev rules
+
 Revision 1.94  2012/02/09 14:58:58  arekm
 - up to 3.12.2
 

================================================================
Index: packages/hplip/hplip-udev-rules.patch
diff -u /dev/null packages/hplip/hplip-udev-rules.patch:1.1
--- /dev/null	Wed Apr 25 11:40:04 2012
+++ packages/hplip/hplip-udev-rules.patch	Wed Apr 25 11:39:59 2012
@@ -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 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@	data/rules/86-hpmud_plugin.rules \
+ @HPLIP_BUILD_TRUE@	data/rules/56-hpmud_add_printer.rules \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/hplip/hplip.spec?r1=1.94&r2=1.95