From 7057a6e0b5cecbf9c11078ec2b095fc8a0137073aace8ae5f2d6aa759455fbe0 Mon Sep 17 00:00:00 2001 From: Johannes Meixner Date: Mon, 6 Jun 2016 09:18:58 +0000 Subject: [PATCH] Accepting request 400159 from home:weberho:branches:Printing * Updated to version 3.16.5 * rebased patches OBS-URL: https://build.opensuse.org/request/show/400159 OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=126 --- ...ssing_includes_and_define_GNU_SOURCE.patch | 11 ---- change-udev-rules.diff | 16 ++---- hplip-3.15.11.tar.gz | 3 - hplip-3.15.11.tar.gz.asc | 7 --- hplip-3.16.5.tar.gz | 3 + hplip-3.16.5.tar.gz.asc | 7 +++ hplip.changes | 55 +++++++++++++++++++ hplip.spec | 6 +- 8 files changed, 74 insertions(+), 34 deletions(-) delete mode 100644 hplip-3.15.11.tar.gz delete mode 100644 hplip-3.15.11.tar.gz.asc create mode 100644 hplip-3.16.5.tar.gz create mode 100644 hplip-3.16.5.tar.gz.asc diff --git a/add_missing_includes_and_define_GNU_SOURCE.patch b/add_missing_includes_and_define_GNU_SOURCE.patch index d5f9012..554fbd6 100644 --- a/add_missing_includes_and_define_GNU_SOURCE.patch +++ b/add_missing_includes_and_define_GNU_SOURCE.patch @@ -57,17 +57,6 @@ diff -Pdpru hplip-3.15.11.orig/scan/sane/bb_ledm.c hplip-3.15.11/scan/sane/bb_le # include # define _STRINGIZE(x) #x -diff -Pdpru hplip-3.15.11.orig/scan/sane/hpaio.c hplip-3.15.11/scan/sane/hpaio.c ---- hplip-3.15.11.orig/scan/sane/hpaio.c 2015-11-12 11:28:47.000000000 +0100 -+++ hplip-3.15.11/scan/sane/hpaio.c 2015-11-19 16:49:04.461174386 +0100 -@@ -45,6 +45,7 @@ - #include "ledm.h" - #include "sclpml.h" - #include "escl.h" -+#include "io.h" - - #define DEBUG_DECLARE_ONLY - #include "sanei_debug.h" diff -Pdpru hplip-3.15.11.orig/scan/sane/sclpml.c hplip-3.15.11/scan/sane/sclpml.c --- hplip-3.15.11.orig/scan/sane/sclpml.c 2015-11-12 11:28:47.000000000 +0100 +++ hplip-3.15.11/scan/sane/sclpml.c 2015-11-19 16:48:16.290576562 +0100 diff --git a/change-udev-rules.diff b/change-udev-rules.diff index 4ad8545..3c08a9b 100644 --- a/change-udev-rules.diff +++ b/change-udev-rules.diff @@ -1,6 +1,7 @@ ---- data/rules/56-hpmud.rules.orig 2015-06-07 21:25:22.000000000 +0200 -+++ data/rules/56-hpmud.rules 2015-06-24 12:35:25.000000000 +0200 -@@ -1,18 +1,50 @@ +diff -ur hplip-3.16.5-orig/data/rules/56-hpmud.rules hplip-3.16.5/data/rules/56-hpmud.rules +--- hplip-3.16.5-orig/data/rules/56-hpmud.rules 2016-05-04 07:23:21.000000000 +0200 ++++ hplip-3.16.5/data/rules/56-hpmud.rules 2016-06-06 09:04:05.828185741 +0200 +@@ -1,8 +1,33 @@ # HPLIP udev rules file. Notify console user if plugin support is required for this device. +# +# SUSE changed: @@ -31,21 +32,16 @@ ACTION!="add", GOTO="hpmud_rules_end" -SUBSYSTEM=="ppdev", OWNER="root", GROUP="lp", MODE="0664" SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="hpmud_usb_rules" -- +SUBSYSTEM=="ppdev", OWNER="root", GROUP="lp", MODE="0664" -+GOTO="hpmud_rules_end" + GOTO="hpmud_rules_end" LABEL="hpmud_usb_rules" - - ENV{ID_USB_INTERFACES}=="", IMPORT{builtin}="usb_id" - - # ENV{ID_HPLIP}="1" is for Ubuntu udev-acl +@@ -13,6 +38,12 @@ 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 '/usr/bin/nohup /usr/bin/hp-config_usb_printer $env{BUSNUM}:$env{DEVNUM}'" +#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}'" -+ +# 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}" + diff --git a/hplip-3.15.11.tar.gz b/hplip-3.15.11.tar.gz deleted file mode 100644 index 7ce4484..0000000 --- a/hplip-3.15.11.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:33c4711bde04a34b81f3f70e6277a0375dded171469e5aa8b9cef1a14a407c6d -size 22277756 diff --git a/hplip-3.15.11.tar.gz.asc b/hplip-3.15.11.tar.gz.asc deleted file mode 100644 index ac2fc11..0000000 --- a/hplip-3.15.11.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) - -iEYEABECAAYFAlZEazsACgkQc9dwzaWQR7m3UACgg+Msyrw5eUu3E3fYuWbLzEE6 -9bgAnic5tdUXV8L6kYmUUyAnr8MlJ6WU -=zfDs ------END PGP SIGNATURE----- diff --git a/hplip-3.16.5.tar.gz b/hplip-3.16.5.tar.gz new file mode 100644 index 0000000..7937d6e --- /dev/null +++ b/hplip-3.16.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c609516003c9613c51e2ef24503e535f8d93693dd618cb6397a2d71f70315ed9 +size 22662561 diff --git a/hplip-3.16.5.tar.gz.asc b/hplip-3.16.5.tar.gz.asc new file mode 100644 index 0000000..7660968 --- /dev/null +++ b/hplip-3.16.5.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iEYEABECAAYFAlcph6wACgkQc9dwzaWQR7k8XgCfV5BRmGvZu5HdoiqWvdnXNTGM +YGsAn10/nwyUPTykWSPKI0cA2OYHZABv +=/qc0 +-----END PGP SIGNATURE----- diff --git a/hplip.changes b/hplip.changes index 3ca66fa..a811496 100644 --- a/hplip.changes +++ b/hplip.changes @@ -1,3 +1,58 @@ +------------------------------------------------------------------- +Mon Jun 6 07:06:46 UTC 2016 - jweberhofer@weberhofer.at + +- rebased change-udev-rules.diff and + add_missing_includes_and_define_GNU_SOURCE.patch +- Version upgrade to 3.16.5 + * Added Support for the Following New Printers: + - HP OfficeJet 200 Mobile Printer Series + - HP OfficeJet Pro 8710 All-in-One Printer + - HP OfficeJet Pro 8715 All-in-One Printer + - HP OfficeJet Pro 8740 All-in-One Printer + - HP OfficeJet Pro 8720 All-in-One Printer + - HP OfficeJet Pro 8725 All-in-One Printer + - HP LaserJet Pro M501n + - HP LaserJet Pro M501dn + * Qt5 support is available. For more information check the following link + http://hplipopensource.com/node/376 + +- Version upgrade to 3.16.3 + * Added Support for the Following New Printers: + - HP PageWide Pro 577dw Multifunction Printer + - HP PageWide Pro 577z Multifunction Printer + - HP PageWide Pro 552dw Printer + - HP PageWide Pro 452dw Printer + - HP PageWide Pro 452dn Printer + - HP PageWide Pro 477dw Multifunction Printer + - HP PageWide Pro 477dn Multifunction Printer + - HP DeskJet GT 5810 All-in-One Printer + - HP DeskJet GT 5820 All-in-One Printer + * fixed issue: Traceback error occurs when ESC button is hit upon the promt + for root/superuser credentials while installing hp-plugin. + +- Version upgrade to 3.16.2 + * Significant Change: Queue configuration using 'hp-setup' command is no more + supported for HP ScanJets. Scan frontends like xsane, hp-scan, scanimage, + simplescan will automatically detect usb and network ScanJets. + * Added Support for the Following New Printers: + - HP ScanJet Pro 4500 fn1 Network scanner + - HP LaserJet Pro MFP M127fs + - HP DeskJet Ultra Ink Advantage 2029 Printer + - HP DeskJet Ink Advantage Ultra 2529 All-in-One Printer + * Issues fixed: + - /usr/lib/sane/libsane-hpaio.so.1: undefined symbol: mdns_probe_nw_scanners + (Launchpad #1521687) + - udev: 56-hpmud.rules should not run usb_id for all USB devices out there + (Launchpad #1537467) + - Upgrade to HPLIP-3.15.11 fails (Launchpad: #1517494) + - HPLIP installation fails with non-english locale (Launchpad: #1536762) + - hp-plugin hangs on 'su' (Launchpad: #1483820) + - hp-plugin infinite loop (Launchpad: #1484916) + - hp-plugin not working - stuck on permission (Launchpad: #1510950) + - HP plugin installation hangs after accepting license (Launchpad: #1502025) + - Debian 8's hplip version is 3.14.6, not 3.15.2 (Launchpad: #1534404) + - Laserjet Pro MFP M127fs is not supported (Launchpad: #1532451) + ------------------------------------------------------------------- Wed Dec 9 10:55:45 UTC 2015 - tchvatal@suse.com diff --git a/hplip.spec b/hplip.spec index 2043644..f46336e 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ # # spec file for package hplip # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,7 +23,7 @@ %endif Name: hplip -Version: 3.15.11 +Version: 3.16.5 Release: 0 Summary: HP's Printing, Scanning, and Faxing Software License: BSD-3-Clause and GPL-2.0+ and MIT @@ -341,7 +341,7 @@ This sub-package is only required by developers. # Be quiet when unpacking: %setup -q # Patch101 change-udev-rules.diff changes the udev rules file 56-hpmud.rules -%patch101 -b .change-udev-rules.orig +%patch101 -p1 -b .change-udev-rules.orig # Patch106 disable_hp-upgrade.patch disables hp-upgrade/upgrade.py for security reasons, # see https://bugzilla.novell.com/show_bug.cgi?id=853405 # To upgrade HPLIP an openSUSE software package manager like YaST or zypper should be used.