pool/hplip
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 228244 from home:mcaj:branches:Printing

Browse Source 
Hi I updated the hplip to the latest stable version 3.14.3. The patch change-udev-rules.diff Needs a push a bit, but changes there are still valid for suse.
I tested it on my home printer and works fine.

OBS-URL: https://build.opensuse.org/request/show/228244
OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=88
This commit is contained in:
Johannes Meixner 2014-04-01 12:09:12 +00:00 committed by Git OBS Bridge
parent 1b405163fe
commit d3697d9f39
6 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
change-udev-rules.diff
View File

@ -1,8 +1,7 @@
--- data/rules/56-hpmud.rules.change-udev-rules.orig 2013-10-11 11:38:53.000000000 +0200 --- data/rules/56-hpmud.rules.orig 2014-03-28 20:51:31.600138795 +0100
+++ data/rules/56-hpmud.rules 2013-10-16 16:04:54.000000000 +0200 +++ data/rules/56-hpmud.rules 2014-03-28 21:29:10.461761052 +0100
@@ -1,18 +1,43 @@ @@ -1,9 +1,31 @@
# HPLIP udev rules file. Notify console user if plugin support is required for this device. # HPLIP udev rules file. Notify console user if plugin support is required for this device.
+# SUSE changed: +# SUSE changed:
+# +#
+# Exchanged the rule to GOTO hpmud_usb_rules if SUBSYSTEM is "usb" +# Exchanged the rule to GOTO hpmud_usb_rules if SUBSYSTEM is "usb"
@ -25,7 +24,7 @@
+# is also used to upload firmware into printers that need it +# is also used to upload firmware into printers that need it
+# see https://bugs.launchpad.net/bugs/1220628 +# see https://bugs.launchpad.net/bugs/1220628
+# a rule that only uploads firmware into printers that need it is added. +# a rule that only uploads firmware into printers that need it is added.
+
ACTION!="add", GOTO="hpmud_rules_end" ACTION!="add", GOTO="hpmud_rules_end"
-SUBSYSTEM=="ppdev", OWNER="root", GROUP="lp", MODE="0664" -SUBSYSTEM=="ppdev", OWNER="root", GROUP="lp", MODE="0664"
SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="hpmud_usb_rules" SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="hpmud_usb_rules"
@ -35,23 +34,15 @@
LABEL="hpmud_usb_rules" LABEL="hpmud_usb_rules"
# ENV{ID_HPLIP}="1" is for Ubuntu udev-acl @@ -12,7 +34,10 @@
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 # 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'" -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 &'"
+# 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'" +#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 &'"
+ +
+# This rule uploads firmware to HP USB printer devices if needed: +# This rule uploads firmware to HP USB printer devices if needed:
+ENV{hp_test}=="yes", PROGRAM="/bin/logger -p user.info udev hpmud.rules runs hp-firmware to test if HP device with USB vendor ID $attr{idVendor} and USB product ID $attr{idProduct} at USB bus ID $env{BUSNUM} and USB device ID $env{DEVNUM} needs firmware and if yes to upload it", RUN+="/usr/bin/hp-firmware -s $env{BUSNUM}:$env{DEVNUM}" +ENV{hp_test}=="yes", PROGRAM="/bin/logger -p user.info udev hpmud.rules runs hp-firmware to test if HP device with USB vendor ID $attr{idVendor} and USB product ID $attr{idProduct} at USB bus ID $env{BUSNUM} and USB device ID $env{DEVNUM} needs firmware and if yes to upload it", RUN+="/usr/bin/hp-firmware -s $env{BUSNUM}:$env{DEVNUM}"
# If sane-bankends is installed add hpaio backend support to dll.conf if needed. # 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'" 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'"
@@ -20,5 +45,5 @@ ENV{sane_hpaio}=="yes", RUN+="/bin/sh -c
# The following rule will disable USB autosuspend for the device
ENV{libsane_matched}=="yes", RUN+="/bin/sh -c 'test -e /sys/$env{DEVPATH}/power/level && echo on > /sys/$env{DEVPATH}/power/level'"
-
LABEL="hpmud_rules_end"
+

3
hplip-3.13.11.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1ea0ed020ab54e08620fe6ea7c30e93dbb8be505f2e6994e7222a7be63ca3b34
size 21104424

7
hplip-3.13.11.tar.gz.asc
View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iEYEABECAAYFAlJyRPYACgkQc9dwzaWQR7k5dQCgsaBp0n2Yw+U4f+idkFfxmrEk
FycAoOgf1EFe+P3pmL+yy7w+aY9INQYk
=puTl
-----END PGP SIGNATURE-----

3
hplip-3.14.3.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1805b103639b51b9d908921e1e77db66c6e78b792aa51e405a5415e8e1c55e6e
size 21178745

7
hplip-3.14.3.tar.gz.asc Normal file
View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iEYEABECAAYFAlMYBFQACgkQc9dwzaWQR7nF7wCgmTFH79zVq0fDhCE1ztzQ2l89
TLYAnigVq7D7loSaYOBYbiWdwtpj2u0C
=tobK
-----END PGP SIGNATURE-----

4
hplip.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package hplip # spec file for package hplip
# #
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -59,7 +59,7 @@ Group: Hardware/Printing
# where 'a' or 'b' do not mean 'alpha' or 'beta' but 'second' or 'third' release in the month # where 'a' or 'b' do not mean 'alpha' or 'beta' but 'second' or 'third' release in the month
# (usually bugfix releases have the suffix like 3.12.10a = first bugfix release for 3.12.10). # (usually bugfix releases have the suffix like 3.12.10a = first bugfix release for 3.12.10).
# Official releases have a 3 digit number and release candidates have a 4 digit number: x.y.m.rc # Official releases have a 3 digit number and release candidates have a 4 digit number: x.y.m.rc
Version: 3.13.11 Version: 3.14.3
Release: 0 Release: 0
Url: http://hplipopensource.com Url: http://hplipopensource.com
# Source0...Source9 is for sources from HP: # Source0...Source9 is for sources from HP: