components/hplip/patches/07_core_install.patch
author Rich Burridge <rich.burridge@oracle.com>
Wed, 20 Jul 2016 10:13:37 -0700
changeset 6439 b66f3093f546
parent 4923 b9e3f6b6a101
permissions -rw-r--r--
24289304 nosetests manpages delivered in /usr/share/man, not /usr/share/man/man1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4923
b9e3f6b6a101 21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 3831
diff changeset
     1
source: in-house
b9e3f6b6a101 21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 3831
diff changeset
     2
Set dbus-daemon path to (non-standard) /usr/lib.
3831
33bc4f8fb536 18462148 Update hplip to 3.14.3 or greater.
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents:
diff changeset
     3
4923
b9e3f6b6a101 21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 3831
diff changeset
     4
--- a/installer/core_install.py	2015-08-26 04:38:39.244369710 -0700
b9e3f6b6a101 21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 3831
diff changeset
     5
+++ b/installer/core_install.py	2015-08-26 04:39:29.269396882 -0700
b9e3f6b6a101 21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 3831
diff changeset
     6
@@ -345,7 +345,7 @@
b9e3f6b6a101 21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 3831
diff changeset
     7
             'scanimage':        (False, ['scan'], SCANIMAGE_STR, self.check_scanimage, DEPENDENCY_RUN_TIME, '1.0','scanimage --version', EXTERNALDEP),
b9e3f6b6a101 21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 3831
diff changeset
     8
 
b9e3f6b6a101 21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 3831
diff changeset
     9
             # Required fax packages
b9e3f6b6a101 21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 3831
diff changeset
    10
-            'dbus':             (True,  ['fax'], DBUS_STR, self.check_dbus, DEPENDENCY_RUN_AND_COMPILE_TIME, '-','dbus-daemon --version', EXTERNALDEP),
b9e3f6b6a101 21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 3831
diff changeset
    11
+            'dbus':             (True,  ['fax'], DBUS_STR, self.check_dbus, DEPENDENCY_RUN_AND_COMPILE_TIME, '-','/usr/lib/dbus-daemon --version', EXTERNALDEP),
b9e3f6b6a101 21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 3831
diff changeset
    12
 
b9e3f6b6a101 21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 3831
diff changeset
    13
             # Required and optional qt4 GUI packages
b9e3f6b6a101 21696841 Update HPLIP to 3.15.7
Jiri Sasek <Jiri.Sasek@Oracle.COM>
parents: 3831
diff changeset
    14
             'policykit':        (False, ['gui_qt4'], POLKIT_STR, self.check_policykit, DEPENDENCY_RUN_TIME,'-','pkexec --version', EXTERNALDEP), # optional for non-sudo behavior of plugins (only optional for Qt4 option)