rpms/hplip
6
0
Fork 0
Code Issues Pull Requests Releases Activity

1985251 - Incorrect permission for gpg directory

Browse Source 
1987141 - hp-plugin installs malformed udev files
fixed warning: redhatenterpriselinux distro is not found in AUTH_TYPES
This commit is contained in:
Zdenek Dohnal 2021-07-30 07:46:03 +02:00
parent d360f3c690
commit 43689ff8e0
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hplip-osname-mismatch.patch Normal file
View File

@ -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:

5
hplip.spec
View File

@ -202,6 +202,8 @@ Patch65: hplip-gpgdir-perms.patch
# 1987141 - hp-plugin installs malformed udev files # 1987141 - hp-plugin installs malformed udev files
# reported upstream https://bugs.launchpad.net/hplip/+bug/1847477 # reported upstream https://bugs.launchpad.net/hplip/+bug/1847477
Patch66: hplip-plugin-udevissues.patch 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 %if 0%{?fedora} || 0%{?rhel} <= 8
# mention hplip-gui if you want to have GUI # mention hplip-gui if you want to have GUI
@ -505,6 +507,8 @@ done
%patch65 -p1 -b .gpgdir-perms %patch65 -p1 -b .gpgdir-perms
# 1987141 - hp-plugin installs malformed udev files # 1987141 - hp-plugin installs malformed udev files
%patch66 -p1 -b .hpplugin-udevperms %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 %if 0%{?fedora} || 0%{?rhel} <= 8
# mention hplip-gui should be installed if you want GUI # 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 <zdohnal@redhat.com> - 3.21.2-10 * Fri Jul 30 2021 Zdenek Dohnal <zdohnal@redhat.com> - 3.21.2-10
- 1985251 - Incorrect permission for gpg directory - 1985251 - Incorrect permission for gpg directory
- 1987141 - hp-plugin installs malformed udev files - 1987141 - hp-plugin installs malformed udev files
- fixed warning: redhatenterpriselinux distro is not found in AUTH_TYPES
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.21.2-9 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.21.2-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild