Djam/hplip
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/hplip.git synced 2025-02-24 08:53:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix spec and sources

Browse source
This commit is contained in:
akdengi 2013-11-25 18:08:04 +04:00
commit fbf353c0a1
3 changed files with 49 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
hplip-apply-udev-rules-on-action-change.patch Normal file
View file

@ -0,0 +1,10 @@
--- a/data/rules/56-hpmud.rules 2013-10-31 15:45:33.000000000 +0400
+++ b/data/rules/56-hpmud.rules 2013-11-21 23:23:07.650886069 +0400
@@ -1,6 +1,6 @@
# HPLIP udev rules file. Notify console user if plugin support is required for this device.
-ACTION!="add", GOTO="hpmud_rules_end"
+ACTION=="remove", GOTO="hpmud_rules_end"
SUBSYSTEM=="ppdev", OWNER="root", GROUP="lp", MODE="0664"
SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="hpmud_usb_rules"

36
hplip-udev-rules.patch Normal file
View file

@ -0,0 +1,36 @@
<<<<<<< HEAD:hplip-3.13.10-fix-udev-rules.patch
--- hplip-3.13.10/data/rules/56-hpmud_sysfs.rules 2013-10-11 09:38:53.000000000 +0000
+++ hplip-3.13.10/data/rules/56-hpmud_sysfs.rules.tpg 2013-10-19 11:15:57.196603385 +0000
@@ -14,9 +14,6 @@
# For RHEL 5, centos 5..
ENV{hp_test}=="yes", PROGRAM="/bin/sh -c 'X=%k; X=$${X#usbdev}; B=$${X%%%%.*}; D=$${X#*.}; logger -p user.info loading HP Device $$B $$D; printf %%03i:%%03i $$B $$D'", RUN+="/bin/sh -c '/usr/bin/python hp-config_usb_printer %c '"
-# This rule will add the printer and install plugin
-ENV{hp_test}=="yes", PROGRAM="/bin/sh -c 'logger -p user.info loading HP Device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c 'if [ -f /usr/bin/systemctl ]; then /usr/bin/systemctl --no-block start hplip-printer@$env{BUSNUM}:$env{DEVNUM}.service; else /usr/bin/nohup /usr/bin/python /usr/bin/hp-config_usb_printer $env{BUSNUM}:$env{DEVNUM} ; fi'"
=======
diff -up hplip-3.13.6/Makefile.in.udev-rules hplip-3.13.6/Makefile.in
--- hplip-3.13.6/Makefile.in.udev-rules 2013-06-24 10:28:19.868301356 +0200
+++ hplip-3.13.6/Makefile.in 2013-06-24 10:32:21.272134161 +0200
@@ -4371,7 +4371,7 @@ cups_drv = prnt/drv/hpcups.drv
@HPLIP_BUILD_TRUE@dist_rulessystem_DATA = data/rules/hplip-printer@.service
# hpmud.rules
-@HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d
+@HPLIP_BUILD_TRUE@rulesdir = /lib/udev/rules.d
@HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE@dist_rules_DATA = data/rules/56-hpmud.rules
@HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@dist_rules_DATA = data/rules/56-hpmud_sysfs.rules
@HPLIP_BUILD_TRUE@halpredir = /usr/share/hal/fdi/preprobe/10osvendor
--- b/data/rules/56-hpmud.rules.old 2013-11-21 23:23:07.000000000 +0400
+++ b/data/rules/56-hpmud.rules 2013-11-21 23:35:51.937475723 +0400
@@ -11,9 +11,6 @@
ATTR{idVendor}=="03f0", ATTR{idProduct}=="????", OWNER="root", GROUP="lp", MODE="0664", ENV{sane_hpaio}="yes", ENV{libsane_matched}="yes", ENV{hp_test}="yes", ENV{ID_HPLIP}="1"
-# This rule will add the printer and install plugin
-ENV{hp_test}=="yes", PROGRAM="/bin/sh -c 'logger -p user.info loading HP Device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c 'if [ -f /usr/bin/systemctl ]; then /usr/bin/systemctl --no-block start hplip-printer@$env{BUSNUM}:$env{DEVNUM}.service; else /usr/bin/nohup /usr/bin/hp-config_usb_printer $env{BUSNUM}:$env{DEVNUM} ; fi'"
>>>>>>> 8c61d1c7c9e7ec8ac21759518f57677e79581a22:hplip-udev-rules.patch
-
# 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'"

7
hplip.spec
View file

@ -17,8 +17,8 @@
Summary: HP printer/all-in-one driver infrastructure
Name: hplip
Version: 3.13.11
Release: 9
Version: 3.13.10
Release: 10
License: GPLv2+ and MIT
Group: System/Printing
Url: http://hplip.sourceforge.net/
@ -514,8 +514,7 @@ if [ -f /etc/init.d/cups ]; then
fi
%post
/bin/systemd-tmpfiles --create %{name}.conf
# tmpfiles_create %{name}
%tmpfiles_create %{name}
%post -n hplip-hpijs-ppds
# Restart CUPS to make the printing PPDs known to it