From 43689ff8e0b6ce62bc73e011c905dc4e43970a1c Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 30 Jul 2021 07:46:03 +0200 Subject: [PATCH] 1985251 - Incorrect permission for gpg directory 1987141 - hp-plugin installs malformed udev files fixed warning: redhatenterpriselinux distro is not found in AUTH_TYPES --- hplip-osname-mismatch.patch | 13 +++++++++++++ hplip.spec | 5 +++++ 2 files changed, 18 insertions(+) create mode 100644 hplip-osname-mismatch.patch diff --git a/hplip-osname-mismatch.patch b/hplip-osname-mismatch.patch new file mode 100644 index 0000000..205de4d --- /dev/null +++ b/hplip-osname-mismatch.patch @@ -0,0 +1,13 @@ +diff --git a/base/password.py b/base/password.py +index bff9f80..269ebd8 100644 +--- a/base/password.py ++++ b/base/password.py +@@ -97,7 +97,7 @@ def get_distro_name(): + os_name = name.read().strip() + name.close() + +- os_name = os_name.lower() ++ os_name = os_name.lower().replace(' ','') + if "redhatenterprise" in os_name: + os_name = 'rhel' + elif "suse" in os_name: diff --git a/hplip.spec b/hplip.spec index 933b2df..5d55498 100644 --- a/hplip.spec +++ b/hplip.spec @@ -202,6 +202,8 @@ Patch65: hplip-gpgdir-perms.patch # 1987141 - hp-plugin installs malformed udev files # reported upstream https://bugs.launchpad.net/hplip/+bug/1847477 Patch66: hplip-plugin-udevissues.patch +# reported upstream https://bugs.launchpad.net/hplip/+bug/1938504 +Patch67: hplip-osname-mismatch.patch %if 0%{?fedora} || 0%{?rhel} <= 8 # mention hplip-gui if you want to have GUI @@ -505,6 +507,8 @@ done %patch65 -p1 -b .gpgdir-perms # 1987141 - hp-plugin installs malformed udev files %patch66 -p1 -b .hpplugin-udevperms +# upstream bug https://bugs.launchpad.net/hplip/+bug/1938504 +%patch67 -p1 -b .osname-mismatch %if 0%{?fedora} || 0%{?rhel} <= 8 # mention hplip-gui should be installed if you want GUI @@ -856,6 +860,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop * Fri Jul 30 2021 Zdenek Dohnal - 3.21.2-10 - 1985251 - Incorrect permission for gpg directory - 1987141 - hp-plugin installs malformed udev files +- fixed warning: redhatenterpriselinux distro is not found in AUTH_TYPES * Thu Jul 22 2021 Fedora Release Engineering - 3.21.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild