rpms/hplip
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Don't specify python version in hplip-printer@.service (bug #1266423)

Browse Source
This commit is contained in:
Jiri Popelka 2015-09-25 14:09:14 +02:00
parent e4cda86f72
commit 1291f31258
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
hplip-udev-rules.patch
View File

@ -1,14 +1,14 @@
diff -up hplip-3.15.7/data/rules/56-hp_conf_usb.rules.udev-rules hplip-3.15.7/data/rules/56-hp_conf_usb.rules
--- hplip-3.15.7/data/rules/56-hp_conf_usb.rules.udev-rules 2015-07-29 16:55:43.945687431 +0200
+++ hplip-3.15.7/data/rules/56-hp_conf_usb.rules 2015-07-29 16:55:43.945687431 +0200
diff -up hplip-3.15.9/data/rules/56-hp_conf_usb.rules.udev-rules hplip-3.15.9/data/rules/56-hp_conf_usb.rules
--- hplip-3.15.9/data/rules/56-hp_conf_usb.rules.udev-rules 2015-09-25 14:03:52.043159504 +0200
+++ hplip-3.15.9/data/rules/56-hp_conf_usb.rules 2015-09-25 14:03:52.043159504 +0200
@@ -0,0 +1,4 @@
+# HPLIP udev rules file.
+
+# This rule will check the smart install feature, plugin status and firmware download for the required printers.
+ENV{hp_test}=="yes", PROGRAM="/bin/sh -c 'logger -p user.info loading HP Device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c 'systemctl --no-block start hplip-printer@$env{BUSNUM}:$env{DEVNUM}.service'"
diff -up hplip-3.15.7/data/rules/56-hpmud.rules.udev-rules hplip-3.15.7/data/rules/56-hpmud.rules
--- hplip-3.15.7/data/rules/56-hpmud.rules.udev-rules 2015-07-13 09:48:49.000000000 +0200
+++ hplip-3.15.7/data/rules/56-hpmud.rules 2015-07-29 16:55:43.945687431 +0200
diff -up hplip-3.15.9/data/rules/56-hpmud.rules.udev-rules hplip-3.15.9/data/rules/56-hpmud.rules
--- hplip-3.15.9/data/rules/56-hpmud.rules.udev-rules 2015-09-14 15:39:40.000000000 +0200
+++ hplip-3.15.9/data/rules/56-hpmud.rules 2015-09-25 14:03:52.044159503 +0200
@@ -12,7 +12,4 @@ ENV{ID_USB_INTERFACES}=="", IMPORT{built
# ENV{ID_HPLIP}="1" is for Ubuntu udev-acl
ATTR{idVendor}=="03f0", ENV{ID_USB_INTERFACES}=="*:0701??:*|*:08????:", OWNER="root", GROUP="lp", MODE="0664", ENV{libsane_matched}="yes", ENV{hp_test}="yes", ENV{ID_HPLIP}="1"
@ -17,10 +17,19 @@ diff -up hplip-3.15.7/data/rules/56-hpmud.rules.udev-rules hplip-3.15.7/data/rul
-ENV{hp_test}=="yes", PROGRAM="/bin/sh -c 'logger -p user.info loading HP Device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/nohup /usr/bin/hp-config_usb_printer $env{BUSNUM}:$env{DEVNUM}'"
-
LABEL="hpmud_rules_end"
diff -up hplip-3.15.7/Makefile.in.udev-rules hplip-3.15.7/Makefile.in
--- hplip-3.15.7/Makefile.in.udev-rules 2015-07-13 09:50:17.000000000 +0200
+++ hplip-3.15.7/Makefile.in 2015-07-29 16:56:45.707539958 +0200
@@ -2463,6 +2463,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-lase
diff -up hplip-3.15.9/data/rules/hplip-printer@.service.udev-rules hplip-3.15.9/data/rules/hplip-printer@.service
--- hplip-3.15.9/data/rules/hplip-printer@.service.udev-rules 2015-09-14 15:39:40.000000000 +0200
+++ hplip-3.15.9/data/rules/hplip-printer@.service 2015-09-25 14:04:40.712096091 +0200
@@ -2,4 +2,4 @@
Description=Configure HP Plugged-In Printer
[Service]
-ExecStart=/usr/bin/python /usr/bin/hp-config_usb_printer "%i"
+ExecStart=/usr/bin/hp-config_usb_printer "%i"
diff -up hplip-3.15.9/Makefile.in.udev-rules hplip-3.15.9/Makefile.in
--- hplip-3.15.9/Makefile.in.udev-rules 2015-09-14 15:42:57.000000000 +0200
+++ hplip-3.15.9/Makefile.in 2015-09-25 14:03:52.045159501 +0200
@@ -2471,6 +2471,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-lase
am__dist_prnt_DATA_DIST = prnt/cups.py prnt/__init__.py prnt/ldl.py \
prnt/pcl.py prnt/colorcal.py
am__dist_rules_DATA_DIST = data/rules/56-hpmud.rules \
@ -28,7 +37,7 @@ diff -up hplip-3.15.7/Makefile.in.udev-rules hplip-3.15.7/Makefile.in
data/rules/56-hpmud_sysfs.rules
am__dist_rulessystem_DATA_DIST = data/rules/hplip-printer@.service
am__dist_scan_DATA_DIST = scan/__init__.py scan/sane.py
@@ -4607,8 +4608,8 @@ cups_drv = prnt/drv/hpcups.drv
@@ -4623,8 +4624,8 @@ cups_drv = prnt/drv/hpcups.drv
@HPLIP_BUILD_TRUE@dist_rulessystem_DATA = data/rules/hplip-printer@.service
# hpmud.rules

8
hplip.spec
View File

@ -7,7 +7,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
Version: 3.15.9
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2+ and MIT and BSD
Url: http://hplip.sourceforge.net/
@ -136,7 +136,8 @@ mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs}
prnt/drv/hpijs.drv.in.deviceIDs-drv-hpijs \
> prnt/drv/hpijs.drv.in
# Move udev rule for calling hp-config_usb_printer into separate file
# Move udev rule for calling hp-config_usb_printer into separate file.
# Don't specify python version in hplip-printer@.service.
# Move udev rules from /etc/ to /usr/lib/ (bug #748208).
%patch6 -p1 -b .udev-rules
@ -448,6 +449,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%postun libs -p /sbin/ldconfig
%changelog
* Fri Sep 25 2015 Jiri Popelka <jpopelka@redhat.com> - 3.15.9-2
- Don't specify python version in hplip-printer@.service (bug #1266423)
* Tue Sep 15 2015 Jiri Popelka <jpopelka@redhat.com> - 3.15.9-1
- 3.15.9