Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package hplip for openSUSE:Factory checked
in at 2022-05-17 17:23:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hplip (Old)
and /work/SRC/openSUSE:Factory/.hplip.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hplip"
Tue May 17 17:23:49 2022 rev:142 rq:977508 version:3.22.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/hplip/hplip.changes 2021-12-16
21:19:13.190519129 +0100
+++ /work/SRC/openSUSE:Factory/.hplip.new.1538/hplip.changes 2022-05-17
17:24:03.211150309 +0200
@@ -1,0 +2,105 @@
+Mon May 9 10:05:36 UTC 2022 - ecsos <ec...@opensuse.org>
+
+- 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
+
+-------------------------------------------------------------------
Old:
----
hplip-3.21.10.tar.gz
hplip-3.21.10.tar.gz.asc
photocard-fix-import-error-for-pcardext.patch
New:
----
hplip-3.22.4.tar.gz
hplip-3.22.4.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hplip.spec ++++++
--- /var/tmp/diff_new_pack.ap6hTf/_old 2022-05-17 17:24:04.695151662 +0200
+++ /var/tmp/diff_new_pack.ap6hTf/_new 2022-05-17 17:24:04.699151665 +0200
@@ -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 @@
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 @@
%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
++++++ Use-lsb_release-fallback-code-if-import-distro-fails.patch ++++++
--- /var/tmp/diff_new_pack.ap6hTf/_old 2022-05-17 17:24:04.743151705 +0200
+++ /var/tmp/diff_new_pack.ap6hTf/_new 2022-05-17 17:24:04.747151709 +0200
@@ -14,44 +14,23 @@
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")
++++++ hplip-3.21.10.tar.gz -> hplip-3.22.4.tar.gz ++++++
/work/SRC/openSUSE:Factory/hplip/hplip-3.21.10.tar.gz
/work/SRC/openSUSE:Factory/.hplip.new.1538/hplip-3.22.4.tar.gz differ: char 5,
line 1
++++++ hplip-missing-drivers.patch ++++++
--- /var/tmp/diff_new_pack.ap6hTf/_old 2022-05-17 17:24:04.847151800 +0200
+++ /var/tmp/diff_new_pack.ap6hTf/_new 2022-05-17 17:24:04.847151800 +0200
@@ -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 @@
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 @@
[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 @@
[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 @@
[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 @@
+ 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)"
}
