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

ignore symlinks when installing plugins, because they are ubuntu-specific

Browse Source 
and are not used, but its checking breaks plugin installation
This commit is contained in:
Zdenek Dohnal 2019-07-12 07:47:21 +02:00
parent bc50238496
commit 5bf6f25893
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hplip-missing-links.patch
View File

@ -1,22 +1,13 @@
diff --git a/installer/pluginhandler.py b/installer/pluginhandler.py diff --git a/installer/pluginhandler.py b/installer/pluginhandler.py
index 4d7c1b8..170cc1a 100755 index 4d7c1b8..1af8d85 100755
--- a/installer/pluginhandler.py --- a/installer/pluginhandler.py
+++ b/installer/pluginhandler.py +++ b/installer/pluginhandler.py
@@ -164,7 +164,16 @@ class PluginHandle(object): @@ -164,7 +164,7 @@ class PluginHandle(object):
for src, trg, link in copies: for src, trg, link in copies:
if link != "": if link != "":
if not utils.check_library(link): if not utils.check_library(link):
- self.__plugin_state = PLUGIN_FILES_CORRUPTED - self.__plugin_state = PLUGIN_FILES_CORRUPTED
+ if (link != '/usr/lib/i386-linux-gnu/libjpeg.so.9' and + pass
+ link != '/usr/lib/x86_64-linux-gnu/libjpeg.so.9' and
+ link != '/usr/lib64/x86_64-linux-gnu/libjpeg.so.9' and
+ link != '/usr/lib/i386-linux-gnu/sane/libsane-hp2000S1.so' and
+ link != '/usr/lib/i386-linux-gnu/sane/libsane-hp2000S1.so.1' and
+ link != '/usr/lib/x86_64-linux-gnu/sane/libsane-hp2000S1.so' and
+ link != '/usr/lib/x86_64-linux-gnu/sane/libsane-hp2000S1.so.1' and
+ link != '/usr/lib64/x86_64-linux-gnu/sane/libsane-hp2000S1.so' and
+ link != '/usr/lib64/x86_64-linux-gnu/sane/libsane-hp2000S1.so.1'):
+ self.__plugin_state = PLUGIN_FILES_CORRUPTED
def __getPluginInformation(self, callback=None): def __getPluginInformation(self, callback=None):

6
hplip.spec
View File

@ -7,7 +7,7 @@
Summary: HP Linux Imaging and Printing Project Summary: HP Linux Imaging and Printing Project
Name: hplip Name: hplip
Version: 3.18.12 Version: 3.18.12
Release: 14%{?dist} Release: 15%{?dist}
License: GPLv2+ and MIT and BSD and IJG and Public Domain and GPLv2+ with exceptions and ISC License: GPLv2+ and MIT and BSD and IJG and Public Domain and GPLv2+ with exceptions and ISC
Url: https://developers.hp.com/hp-linux-imaging-and-printing Url: https://developers.hp.com/hp-linux-imaging-and-printing
@ -663,6 +663,10 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio %config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio
%changelog %changelog
* Thu Jul 11 2019 Zdenek Dohnal <zdohnal@redhat.com> - 3.18.12-15
- ignore symlinks when installing plugins, because they are ubuntu-specific
and are not used, but its checking breaks plugin installation
* Tue Jul 09 2019 Zdenek Dohnal <zdohnal@redhat.com> - 3.18.12-14 * Tue Jul 09 2019 Zdenek Dohnal <zdohnal@redhat.com> - 3.18.12-14
- remove old obsoletes and provides for hpijs, libsane-hpoj and hplip-compat-libs - remove old obsoletes and provides for hpijs, libsane-hpoj and hplip-compat-libs