diff --git a/.gitignore b/.gitignore index 5f839ea..8c1b865 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,4 @@ hplip-3.10.6.tar.gz /hplip-3.14.10.tar.gz /hplip-3.15.2.tar.gz /hplip-3.15.4.tar.gz +/hplip-3.15.6.tar.gz diff --git a/hplip-3.15.4.tar.gz.asc b/hplip-3.15.4.tar.gz.asc deleted file mode 100644 index b8d156f..0000000 --- a/hplip-3.15.4.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) - -iEYEABECAAYFAlUs5JkACgkQc9dwzaWQR7kX6QCfQrjES2UQSQNadZD7kT+SyeFr -9woAoKJjGtKRmFF7tucUCxZN/uBmLsNe -=RtGm ------END PGP SIGNATURE----- diff --git a/hplip-3.15.6.tar.gz.asc b/hplip-3.15.6.tar.gz.asc new file mode 100644 index 0000000..291dd8d --- /dev/null +++ b/hplip-3.15.6.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iEYEABECAAYFAlV0nCUACgkQc9dwzaWQR7l9EQCgokW2aC+oyEJx2IbcQ0MHzZFB +HZYAn2A+7AtDc6KuGCoe5THtlaVb2oUY +=OTvD +-----END PGP SIGNATURE----- diff --git a/hplip-udev-rules.patch b/hplip-udev-rules.patch index 355f188..d54b786 100644 --- a/hplip-udev-rules.patch +++ b/hplip-udev-rules.patch @@ -1,21 +1,18 @@ -diff -up hplip-3.14.10/data/rules/56-hpmud.rules.udev-rules hplip-3.14.10/data/rules/56-hpmud.rules ---- hplip-3.14.10/data/rules/56-hpmud.rules.udev-rules 2014-10-07 15:58:17.081756602 +0200 -+++ hplip-3.14.10/data/rules/56-hpmud.rules 2014-10-07 16:01:21.372127237 +0200 -@@ -10,10 +10,6 @@ LABEL="hpmud_usb_rules" +diff -up hplip-3.15.6/data/rules/56-hpmud.rules.udev-rules hplip-3.15.6/data/rules/56-hpmud.rules +--- hplip-3.15.6/data/rules/56-hpmud.rules.udev-rules 2015-06-10 19:27:31.068051786 +0200 ++++ hplip-3.15.6/data/rules/56-hpmud.rules 2015-06-10 19:28:46.533854350 +0200 +@@ -12,7 +12,4 @@ ENV{ID_USB_INTERFACES}=="", IMPORT{built # ENV{ID_HPLIP}="1" is for Ubuntu udev-acl - 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" + 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" -- -# 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 '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 '/usr/bin/nohup /usr/bin/hp-config_usb_printer $env{BUSNUM}:$env{DEVNUM}'" - - # 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'" - -diff -up hplip-3.14.10/Makefile.in.udev-rules hplip-3.14.10/Makefile.in ---- hplip-3.14.10/Makefile.in.udev-rules 2014-10-07 10:56:30.000000000 +0200 -+++ hplip-3.14.10/Makefile.in 2014-10-07 15:58:17.084756560 +0200 -@@ -4550,7 +4550,7 @@ cups_drv = prnt/drv/hpcups.drv + LABEL="hpmud_rules_end" +diff -up hplip-3.15.6/Makefile.in.udev-rules hplip-3.15.6/Makefile.in +--- hplip-3.15.6/Makefile.in.udev-rules 2015-06-07 21:26:22.000000000 +0200 ++++ hplip-3.15.6/Makefile.in 2015-06-10 19:27:31.069051784 +0200 +@@ -4591,7 +4591,7 @@ cups_drv = prnt/drv/hpcups.drv @HPLIP_BUILD_TRUE@dist_rulessystem_DATA = data/rules/hplip-printer@.service # hpmud.rules diff --git a/hplip.spec b/hplip.spec index cb591b7..3e9794a 100644 --- a/hplip.spec +++ b/hplip.spec @@ -9,7 +9,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 3.15.4 +Version: 3.15.6 Release: 1%{?dist} License: GPLv2+ and MIT @@ -523,6 +523,9 @@ rm -f ppds-all %postun libs -p /sbin/ldconfig %changelog +* Wed Jun 10 2015 Jiri Popelka - 3.15.6-1 +- 3.15.6 + * Thu Apr 16 2015 Jiri Popelka - 3.15.4-1 - 3.15.4 diff --git a/sources b/sources index 7dcd158..497d1fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2cc12f3c8c2cf023891980c8a6b3fa5d hplip-3.15.4.tar.gz +fd0a9092c74f5d1e8cf01203365b5030 hplip-3.15.6.tar.gz