From 5bf6f25893b936ecaf7a65cd4553501400188d93 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 12 Jul 2019 07:47:21 +0200 Subject: [PATCH] ignore symlinks when installing plugins, because they are ubuntu-specific and are not used, but its checking breaks plugin installation --- hplip-missing-links.patch | 15 +++------------ hplip.spec | 6 +++++- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/hplip-missing-links.patch b/hplip-missing-links.patch index cf9c102..3e19877 100644 --- a/hplip-missing-links.patch +++ b/hplip-missing-links.patch @@ -1,22 +1,13 @@ diff --git a/installer/pluginhandler.py b/installer/pluginhandler.py -index 4d7c1b8..170cc1a 100755 +index 4d7c1b8..1af8d85 100755 --- a/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: if link != "": if not utils.check_library(link): - self.__plugin_state = PLUGIN_FILES_CORRUPTED -+ if (link != '/usr/lib/i386-linux-gnu/libjpeg.so.9' and -+ 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 ++ pass def __getPluginInformation(self, callback=None): diff --git a/hplip.spec b/hplip.spec index 5383200..0cde536 100644 --- a/hplip.spec +++ b/hplip.spec @@ -7,7 +7,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip 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 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 %changelog +* Thu Jul 11 2019 Zdenek Dohnal - 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 - 3.18.12-14 - remove old obsoletes and provides for hpijs, libsane-hpoj and hplip-compat-libs