From 02fcdca4e8fbe10b364760b35e04b3bd261c3520c01b1f7be89fd7547b63056e Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Thu, 12 May 2022 16:34:10 +0000 Subject: [PATCH] Accepting request 975789 from home:ecsos - Update to 3.22.4 OBS-URL: https://build.opensuse.org/request/show/975789 OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=222 --- ...fallback-code-if-import-distro-fails.patch | 41 ++----- hplip-3.21.10.tar.gz | 3 - hplip-3.21.10.tar.gz.asc | 7 -- hplip-3.22.4.tar.gz | 3 + hplip-3.22.4.tar.gz.asc | 7 ++ hplip-missing-drivers.patch | 46 ++++---- hplip.changes | 105 ++++++++++++++++++ hplip.spec | 7 +- photocard-fix-import-error-for-pcardext.patch | 27 ----- 9 files changed, 150 insertions(+), 96 deletions(-) delete mode 100644 hplip-3.21.10.tar.gz delete mode 100644 hplip-3.21.10.tar.gz.asc create mode 100644 hplip-3.22.4.tar.gz create mode 100644 hplip-3.22.4.tar.gz.asc delete mode 100644 photocard-fix-import-error-for-pcardext.patch diff --git a/Use-lsb_release-fallback-code-if-import-distro-fails.patch b/Use-lsb_release-fallback-code-if-import-distro-fails.patch index 1626eea..d89083c 100644 --- a/Use-lsb_release-fallback-code-if-import-distro-fails.patch +++ b/Use-lsb_release-fallback-code-if-import-distro-fails.patch @@ -14,43 +14,22 @@ using lsb_release. installer/core_install.py | 10 +++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) -Index: hplip-3.20.9/base/password.py +Index: hplip-3.22.4/installer/core_install.py =================================================================== ---- hplip-3.20.9.orig/base/password.py -+++ hplip-3.20.9/base/password.py -@@ -84,8 +84,12 @@ def get_distro_name(): - try: - os_name = platform.dist()[0] - except AttributeError: -- import distro -- os_name = distro.linux_distribution()[0] -+ try: -+ import distro -+ os_name = distro.linux_distribution()[0] -+ except (ImportError, AttributeError): -+ # Use fallback code below -+ pass - - if not os_name: - name = os.popen('lsb_release -i | cut -f 2') -Index: hplip-3.20.9/installer/core_install.py -=================================================================== ---- hplip-3.20.9.orig/installer/core_install.py -+++ hplip-3.20.9/installer/core_install.py -@@ -647,9 +647,13 @@ class CoreInstall(object): - name = platform.dist()[0].lower() - ver = platform.dist()[1] - except AttributeError: -- import distro -- name = distro.linux_distribution()[0].lower() -- ver = distro.linux_distribution()[1] +--- hplip-3.22.4.orig/installer/core_install.py ++++ hplip-3.22.4/installer/core_install.py +@@ -651,6 +651,14 @@ class CoreInstall(object): + name = distro.linux_distribution()[0].lower() + ver = distro.linux_distribution()[1] + distro_release_name = distro.distro_release_attr('name') + try: + import distro + name = distro.linux_distribution()[0].lower() + ver = distro.linux_distribution()[1] ++ distro_release_name = distro.distro_release_attr('name') + except (ImportError, AttributeError): + # Use fallback code below -+ pass - ++ pass if not name: found = False + log.debug("Not able to detect distro") diff --git a/hplip-3.21.10.tar.gz b/hplip-3.21.10.tar.gz deleted file mode 100644 index dab90b3..0000000 --- a/hplip-3.21.10.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:de230e1fdd1e718fc718417265612e0c882949e08fe045ee56f9f9882e6b6a60 -size 27309040 diff --git a/hplip-3.21.10.tar.gz.asc b/hplip-3.21.10.tar.gz.asc deleted file mode 100644 index 09c61ed..0000000 --- a/hplip-3.21.10.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) - -iEYEABECAAYFAmF7FyUACgkQc9dwzaWQR7lpqQCffzPBukXKeyZjUzR05YFGBSbh -FTMAoLIfJ1fVNlGuyellDriLzVE0sZZ/ -=36gK ------END PGP SIGNATURE----- diff --git a/hplip-3.22.4.tar.gz b/hplip-3.22.4.tar.gz new file mode 100644 index 0000000..ecfd0ee --- /dev/null +++ b/hplip-3.22.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7be9e547c5ac40917160ef34f59f82275d1daea577067f7eeeb2ae07c7bec110 +size 27479009 diff --git a/hplip-3.22.4.tar.gz.asc b/hplip-3.22.4.tar.gz.asc new file mode 100644 index 0000000..b9c31ce --- /dev/null +++ b/hplip-3.22.4.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iEYEABECAAYFAmJncqMACgkQc9dwzaWQR7mhsQCgoG+oTBNm1OX0jIWfqrJhGRj9 +hWoAn1+UnlH45FBFAkEHSEzqzEcUl0hH +=oeM4 +-----END PGP SIGNATURE----- diff --git a/hplip-missing-drivers.patch b/hplip-missing-drivers.patch index 3507742..c9439e4 100644 --- a/hplip-missing-drivers.patch +++ b/hplip-missing-drivers.patch @@ -1,8 +1,8 @@ -diff --git a/cups_drv.inc b/cups_drv.inc -index 3863c52..50c570d 100644 ---- a/cups_drv.inc -+++ b/cups_drv.inc -@@ -398,6 +398,7 @@ cups_ppd_printers = \ +Index: hplip-3.22.4/cups_drv.inc +=================================================================== +--- hplip-3.22.4.orig/cups_drv.inc ++++ hplip-3.22.4/cups_drv.inc +@@ -411,6 +411,7 @@ cups_ppd_printers = \ ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz \ ppd/hpcups/hp-laserjet_cp1025.ppd.gz \ ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz \ @@ -10,18 +10,18 @@ index 3863c52..50c570d 100644 ppd/hpcups/hp-laserjet_m1005.ppd.gz \ ppd/hpcups/hp-laserjet_m101-m106.ppd.gz \ ppd/hpcups/hp-laserjet_m109-m112.ppd.gz \ -@@ -510,6 +511,7 @@ cups_ppd_printers = \ +@@ -527,6 +528,7 @@ cups_ppd_printers = \ ppd/hpcups/hp-laserjet_professional_p1607dn.ppd.gz \ ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz \ ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz \ + ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \ ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz \ - ppd/hpcups/hp-mopier_240-pcl3.ppd.gz \ - ppd/hpcups/hp-mopier_320-pcl3.ppd.gz \ -diff --git a/data/models/models.dat b/data/models/models.dat -index 9dfcf3d..9da0acd 100644 ---- a/data/models/models.dat -+++ b/data/models/models.dat + ppd/hpcups/hp-laserjet_tank_1020.ppd.gz \ + ppd/hpcups/hp-laserjet_tank_150x.ppd.gz \ +Index: hplip-3.22.4/data/models/models.dat +=================================================================== +--- hplip-3.22.4.orig/data/models/models.dat ++++ hplip-3.22.4/data/models/models.dat @@ -2104,7 +2104,7 @@ usb-pid=411 usb-vid=3f0 wifi-config=0 @@ -425,7 +425,7 @@ index 9dfcf3d..9da0acd 100644 [officejet_100_mobile_l411] align-type=-1 clean-type=1 -@@ -17865,6 +18229,58 @@ usb-pid=2c17 +@@ -17867,6 +18231,58 @@ usb-pid=2c17 usb-vid=3f0 wifi-config=0 @@ -484,7 +484,7 @@ index 9dfcf3d..9da0acd 100644 [hp_laserjet_cp1025nw] align-type=0 clean-type=0 -@@ -18466,6 +18882,49 @@ usb-pid=3011 +@@ -18468,6 +18884,49 @@ usb-pid=3011 usb-vid=3f0 wifi-config=0 @@ -534,15 +534,14 @@ index 9dfcf3d..9da0acd 100644 [hp_laserjet_professional_p1102] align-type=0 clean-type=0 -diff --git a/prnt/drv/hpcups.drv.in b/prnt/drv/hpcups.drv.in -index 335b3da..d7a1872 100644 ---- a/prnt/drv/hpcups.drv.in -+++ b/prnt/drv/hpcups.drv.in -@@ -22258,6 +22258,14 @@ Group "RLT/HP Real Life Technologies" - Attribute "Product" "" "(HP LaserJet Professional p1102 Printer)" +Index: hplip-3.22.4/prnt/drv/hpcups.drv.in +=================================================================== +--- hplip-3.22.4.orig/prnt/drv/hpcups.drv.in ++++ hplip-3.22.4/prnt/drv/hpcups.drv.in +@@ -22689,6 +22689,14 @@ Group "RLT/HP Real Life Technologies" Attribute "Product" "" "(HP LaserJet Professional p1102s Printer)" } -+ { + { + ModelName "HP LaserJet Professional p1102w" + Attribute "NickName" "" "HP LaserJet Professional p1102w, hpcups $Version, requires proprietary plugin" + Attribute "ShortNickName" "" "HP LaserJet Professional p1102w hpijs" @@ -550,10 +549,11 @@ index 335b3da..d7a1872 100644 + PCFileName "hp-laserjet_professional_p1102w.ppd" + Attribute "Product" "" "(HP LaserJet Professional p1102w Printer)" + } - { ++ { ModelName "HP LaserJet Professional p1106" Attribute "NickName" "" "HP LaserJet Professional p1106, hpcups $Version" -@@ -22692,6 +22700,14 @@ Group "RLT/HP Real Life Technologies" + Attribute "ShortNickName" "" "HP LJ Pro p1106 hpijs" +@@ -23122,6 +23130,14 @@ Group "RLT/HP Real Life Technologies" PCFileName "hp-laserjet_cp1025nw.ppd" Attribute "Product" "" "(HP LaserJet Pro cp1025nw Color Printer Series)" } diff --git a/hplip.changes b/hplip.changes index 72d0d24..0342442 100644 --- a/hplip.changes +++ b/hplip.changes @@ -1,3 +1,108 @@ +------------------------------------------------------------------- +Mon May 9 10:05:36 UTC 2022 - ecsos + +- Update to 3.22.4 + Added support for following new Distro's: + * Manjaro 21.2 + Added support for the following new Printers: + * HP LaserJet Pro 4001ne + * HP LaserJet Pro 4001n + * HP LaserJet Pro 4001dne + * HP LaserJet Pro 4001dn + * HP LaserJet Pro 4001dwe + * HP LaserJet Pro 4001dw + * HP LaserJet Pro 4001d + * HP LaserJet Pro 4001de + * HP LaserJet Pro 4002ne + * HP LaserJet Pro 4002n + * HP LaserJet Pro 4002dne + * HP LaserJet Pro 4002dn + * HP LaserJet Pro 4002dwe + * HP LaserJet Pro 4002dw + * HP LaserJet Pro 4002d + * HP LaserJet Pro 4002de + * HP LaserJet Pro 4003dn + * HP LaserJet Pro 4003dw + * HP LaserJet Pro 4003n + * HP LaserJet Pro 4003d + * HP LaserJet Pro 4004d + * HP LaserJet Pro 4004dn + * HP LaserJet Pro 4004dw + * HP LaserJet Pro MFP 4101dwe + * HP LaserJet Pro MFP 4101dw + * HP LaserJet Pro MFP 4101fdn + * HP LaserJet Pro MFP 4101fdne + * HP LaserJet Pro MFP 4101fdw + * HP LaserJet Pro MFP 4101fdwe + * HP LaserJet Pro MFP 4102dwe + * HP LaserJet Pro MFP 4102dw + * HP LaserJet Pro MFP 4102fdn + * HP LaserJet Pro MFP 4102fdw + * HP LaserJet Pro MFP 4102fdwe + * HP LaserJet Pro MFP 4102fdne + * HP LaserJet Pro MFP 4102fnw + * HP LaserJet Pro MFP 4102fnwe + * HP LaserJet Pro MFP 4103dw + * HP LaserJet Pro MFP 4103dn + * HP LaserJet Pro MFP 4103fdn + * HP LaserJet Pro MFP 4103fdw + * HP LaserJet Pro MFP 4104dw + * HP LaserJet Pro MFP 4104fdw + * HP LaserJet Pro MFP 4104fdn + * HP ScanJet Pro 3600 f1 + * HP ScanJet Pro N4600 fnw1 + * HP ScanJet Pro 2600 f1 + * HP ScanJet Enterprise Flow N6600 fnw1 +- Changes from 3.22.2 + Added support for following new Distro's: + * Elementary OS 6.1 + * RHEL 8.5 + * Linux Mint 20.3 + Added support for the following new Printers: + * HP LaserJet Tank MFP 1602a + * HP LaserJet Tank MFP 1602w + * HP LaserJet Tank MFP 1604w + * HP LaserJet Tank MFP 2602dn + * HP LaserJet Tank MFP 2602sdn + * HP LaserJet Tank MFP 2602sdw + * HP LaserJet Tank MFP 2602dw + * HP LaserJet Tank MFP 2604dw + * HP LaserJet Tank MFP 2604sdw + * HP LaserJet Tank MFP 2603dw + * HP LaserJet Tank MFP 2603sdw + * HP LaserJet Tank MFP 2605sdw + * HP LaserJet Tank MFP 2606dn + * HP LaserJet Tank MFP 2606sdn + * HP LaserJet Tank MFP 2606sdw + * HP LaserJet Tank MFP 2606dw + * HP LaserJet Tank MFP 2606dc + * HP LaserJet Tank MFP 1005 + * HP LaserJet Tank MFP 1005w + * HP LaserJet Tank MFP 1005nw + * HP LaserJet Tank 1502a + * HP LaserJet Tank 1502w + * HP LaserJet Tank 1504w + * HP LaserJet Tank 2502dw + * HP LaserJet Tank 2502dn + * HP LaserJet Tank 2504dw + * HP LaserJet Tank 2503dw + * HP LaserJet Tank 2506dw + * HP LaserJet Tank 2506d + * HP LaserJet Tank 2506dn + * HP LaserJet Tank 1020 + * HP LaserJet Tank 1020w + * HP LaserJet Tank 1020nw +- Changes from 3.21.12 + Added support for following new Distro's: + * MX Linux 21 + * Elementary OS 6 + * Fedora 35 +- Drop photocard-fix-import-error-for-pcardext.patch, + because now in upstream. +- Rebase Use-lsb_release-fallback-code-if-import-distro-fails.patch, + bacause some is in upstream now. +- Reabse hplip-missing-drivers.patch + ------------------------------------------------------------------- Tue Dec 14 14:43:11 UTC 2021 - Martin Wilck diff --git a/hplip.spec b/hplip.spec index 54b4392..91d6e92 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ # # spec file for package hplip # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ %define pyexe %{_bindir}/python3 %global use_qt5 1 Name: hplip -Version: 3.21.10 +Version: 3.22.4 Release: 0 Summary: HP's Printing, Scanning, and Faxing Software License: BSD-3-Clause AND GPL-2.0-or-later AND MIT @@ -70,8 +70,6 @@ Patch112: ui5-systemtray-wait-only-10s-for-system-tray.patch Patch300: pcardext-python3-fixes.patch Patch301: hplip-misc-missing-includes-and-definitions.patch Patch302: hp_ipp.h-add-missing-prototypes.patch -# Fix import error for pcardext -Patch303: photocard-fix-import-error-for-pcardext.patch # bsc#1159240, lp#1859179 Patch304: hp-sendfax-avoid-crash-if-python-reportlab-is-missin.patch # bsc#1166623, hp-toolbox crashes without python3-distro module @@ -316,7 +314,6 @@ This sub-package is only required by developers. %patch300 -p1 -b .pcardext-python3 %patch301 -p1 -b .misc-headers %patch302 -p1 -b .hp_ipp_missing_prototypes -%patch303 -p1 -b .photocard_import %patch304 -p1 %patch305 -p1 %patch306 -p1 diff --git a/photocard-fix-import-error-for-pcardext.patch b/photocard-fix-import-error-for-pcardext.patch deleted file mode 100644 index ecbd06b..0000000 --- a/photocard-fix-import-error-for-pcardext.patch +++ /dev/null @@ -1,27 +0,0 @@ -From adca775071398e0dbb87a972798ee82975794640 Mon Sep 17 00:00:00 2001 -From: Martin Wilck -Date: Thu, 22 Mar 2018 09:30:38 +0100 -Subject: [PATCH] photocard: fix import error for pcardext - -Due to the way the C module is installed, explicit relative -import doesn't work for pcardext. ---- - pcard/photocard.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pcard/photocard.py b/pcard/photocard.py -index 913dc4e98d7f..2c7315883c8d 100644 ---- a/pcard/photocard.py -+++ b/pcard/photocard.py -@@ -30,7 +30,7 @@ from base.codes import * - from base import device, utils, exif - - try: -- from . import pcardext -+ import pcardext - except ImportError: - if not os.getenv("HPLIP_BUILD"): - log.error("PCARDEXT could not be loaded. Please check HPLIP installation.") --- -2.16.1 -