Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package hplip for openSUSE:Factory checked
in at 2023-01-04 17:50:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hplip (Old)
and /work/SRC/openSUSE:Factory/.hplip.new.1563 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hplip"
Wed Jan 4 17:50:42 2023 rev:147 rq:1046214 version:3.22.10
Changes:
--------
--- /work/SRC/openSUSE:Factory/hplip/hplip.changes 2022-11-22
16:10:04.469996974 +0100
+++ /work/SRC/openSUSE:Factory/.hplip.new.1563/hplip.changes 2023-01-04
17:50:52.133568446 +0100
@@ -1,0 +2,8 @@
+Mon Jan 2 14:08:12 UTC 2023 - Martin Wilck <mwi...@suse.com>
+
+- Update to 3.22.10
+ * drop no-systray-failure-message.patch (fixed upstream)
+ * adapt Use-lsb_release-fallback-code-if-import-distro-fails.patch
+ (code moved to different source file upstream)
+
+-------------------------------------------------------------------
Old:
----
hplip-3.22.6.tar.gz
hplip-3.22.6.tar.gz.asc
no-systray-failure-message.patch
New:
----
hplip-3.22.10.tar.gz
hplip-3.22.10.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hplip.spec ++++++
--- /var/tmp/diff_new_pack.8M0whX/_old 2023-01-04 17:50:54.017579551 +0100
+++ /var/tmp/diff_new_pack.8M0whX/_new 2023-01-04 17:50:54.021579575 +0100
@@ -1,7 +1,7 @@
#
# spec file for package hplip
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 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.22.6
+Version: 3.22.10
Release: 0
Summary: HP's Printing, Scanning, and Faxing Software
License: BSD-3-Clause AND GPL-2.0-or-later AND MIT
@@ -62,8 +62,6 @@
# Patch108 add_missing_includes_and_define_GNU_SOURCE.patch adds missing
'#include <...>'
# and missing '#define _GNU_SOURCE' see
https://bugs.launchpad.net/hplip/+bug/1456590
Patch108: add_missing_includes_and_define_GNU_SOURCE.patch
-# PATCH-FIX-SUSE: GNOME no longer provides a system tray, so don't warn the
user that we can't find it
-Patch109: no-systray-failure-message.patch
Patch110: hpijs-avoid-segfault-in-DJGenericVIP-DJGenericVIP.patch
Patch112: ui5-systemtray-wait-only-10s-for-system-tray.patch
# Python3 port: cleanup patches
@@ -319,7 +317,6 @@
# Patch108 add_missing_includes_and_define_GNU_SOURCE.patch adds missing
'#include <...>'
# and missing '#define _GNU_SOURCE' see
https://bugs.launchpad.net/hplip/+bug/1456590
%patch108 -p1 -b .add_missing_includes_and_define_GNU_SOURCE.orig
-%patch109 -p1 -b .systemtray.py.orig
%patch110 -p1 -b .boo1094141
%patch112 -p1
%patch300 -p1 -b .pcardext-python3
++++++ Use-lsb_release-fallback-code-if-import-distro-fails.patch ++++++
--- /var/tmp/diff_new_pack.8M0whX/_old 2023-01-04 17:50:54.049579740 +0100
+++ /var/tmp/diff_new_pack.8M0whX/_new 2023-01-04 17:50:54.053579763 +0100
@@ -1,6 +1,6 @@
-From 5ff90c0210be6b9b48f5cc269d2450e85a958ec0 Mon Sep 17 00:00:00 2001
+From ba542439639453148ea804fc4e396534cd99abb9 Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwi...@suse.com>
-Date: Mon, 16 Mar 2020 14:33:35 +0100
+Date: Mon, 2 Jan 2023 15:33:07 +0100
Subject: [PATCH] Use lsb_release fallback code if "import distro" fails
With python 3.8, the standard python "platform" module doesn't
@@ -10,27 +10,33 @@
already existing fallback code to determine the distribution
using lsb_release.
---
- base/password.py | 8 ++++++--
- installer/core_install.py | 10 +++++++---
- 2 files changed, 13 insertions(+), 5 deletions(-)
+ base/utils.py | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/base/utils.py b/base/utils.py
+index 94d5c8c..458ddd8 100644
+--- a/base/utils.py
++++ b/base/utils.py
+@@ -2519,10 +2519,14 @@ def get_distro_name(passwordObj = None):
+ name = platform.dist()[0].lower()
+ ver = platform.dist()[1]
+ except AttributeError:
+- import distro
+- 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
+ if not name:
+ found = False
+ log.debug("Not able to detect distro")
+--
+2.39.0
-Index: hplip-3.22.4/installer/core_install.py
-===================================================================
---- 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
- if not name:
- found = False
- log.debug("Not able to detect distro")
++++++ hplip-3.22.6.tar.gz -> hplip-3.22.10.tar.gz ++++++
/work/SRC/openSUSE:Factory/hplip/hplip-3.22.6.tar.gz
/work/SRC/openSUSE:Factory/.hplip.new.1563/hplip-3.22.10.tar.gz differ: char
13, line 1
