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

run autoreconf instead of patching libtool script to work-around rpath issues

Browse Source 
There's been a libhpdiscovery since 3.15.11, which messes up builds
when we remove rpath from libtool script.
Running autoreconf seems to work-around the problem.
This commit is contained in:
Jiri Popelka 2015-11-18 14:26:40 +01:00
parent 20a509233f
commit 90b9b0eaf8
2 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
hplip-udev-rules.patch
View File

@ -1,14 +1,14 @@
diff -up hplip-3.15.9/data/rules/56-hp_conf_usb.rules.udev-rules hplip-3.15.9/data/rules/56-hp_conf_usb.rules diff -up hplip-3.15.11/data/rules/56-hp_conf_usb.rules.udev-rules hplip-3.15.11/data/rules/56-hp_conf_usb.rules
--- hplip-3.15.9/data/rules/56-hp_conf_usb.rules.udev-rules 2015-09-25 14:03:52.043159504 +0200 --- hplip-3.15.11/data/rules/56-hp_conf_usb.rules.udev-rules 2015-11-18 13:41:08.003952433 +0100
+++ hplip-3.15.9/data/rules/56-hp_conf_usb.rules 2015-09-25 14:03:52.043159504 +0200 +++ hplip-3.15.11/data/rules/56-hp_conf_usb.rules 2015-11-18 13:41:08.003952433 +0100
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
+# HPLIP udev rules file. +# HPLIP udev rules file.
+ +
+# This rule will check the smart install feature, plugin status and firmware download for the required printers. +# This rule will check the smart install feature, plugin status and firmware download for the required printers.
+ENV{hp_test}=="yes", PROGRAM="/bin/sh -c 'logger -p user.info loading HP Device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c 'systemctl --no-block start hplip-printer@$env{BUSNUM}:$env{DEVNUM}.service'" +ENV{hp_test}=="yes", PROGRAM="/bin/sh -c 'logger -p user.info loading HP Device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c 'systemctl --no-block start hplip-printer@$env{BUSNUM}:$env{DEVNUM}.service'"
diff -up hplip-3.15.9/data/rules/56-hpmud.rules.udev-rules hplip-3.15.9/data/rules/56-hpmud.rules diff -up hplip-3.15.11/data/rules/56-hpmud.rules.udev-rules hplip-3.15.11/data/rules/56-hpmud.rules
--- hplip-3.15.9/data/rules/56-hpmud.rules.udev-rules 2015-09-14 15:39:40.000000000 +0200 --- hplip-3.15.11/data/rules/56-hpmud.rules.udev-rules 2015-11-12 11:28:50.000000000 +0100
+++ hplip-3.15.9/data/rules/56-hpmud.rules 2015-09-25 14:03:52.044159503 +0200 +++ hplip-3.15.11/data/rules/56-hpmud.rules 2015-11-18 13:41:08.003952433 +0100
@@ -12,7 +12,4 @@ ENV{ID_USB_INTERFACES}=="", IMPORT{built @@ -12,7 +12,4 @@ ENV{ID_USB_INTERFACES}=="", IMPORT{built
# ENV{ID_HPLIP}="1" is for Ubuntu udev-acl # ENV{ID_HPLIP}="1" is for Ubuntu udev-acl
ATTR{idVendor}=="03f0", ENV{ID_USB_INTERFACES}=="*:0701??:*|*:08????:", OWNER="root", GROUP="lp", MODE="0664", ENV{libsane_matched}="yes", ENV{hp_test}="yes", ENV{ID_HPLIP}="1" ATTR{idVendor}=="03f0", ENV{ID_USB_INTERFACES}=="*:0701??:*|*:08????:", OWNER="root", GROUP="lp", MODE="0664", ENV{libsane_matched}="yes", ENV{hp_test}="yes", ENV{ID_HPLIP}="1"
@ -17,34 +17,29 @@ diff -up hplip-3.15.9/data/rules/56-hpmud.rules.udev-rules hplip-3.15.9/data/rul
-ENV{hp_test}=="yes", PROGRAM="/bin/sh -c 'logger -p user.info loading HP Device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/nohup /usr/bin/hp-config_usb_printer $env{BUSNUM}:$env{DEVNUM}'" -ENV{hp_test}=="yes", PROGRAM="/bin/sh -c 'logger -p user.info loading HP Device $env{BUSNUM} $env{DEVNUM}'", RUN+="/bin/sh -c '/usr/bin/nohup /usr/bin/hp-config_usb_printer $env{BUSNUM}:$env{DEVNUM}'"
- -
LABEL="hpmud_rules_end" LABEL="hpmud_rules_end"
diff -up hplip-3.15.9/data/rules/hplip-printer@.service.udev-rules hplip-3.15.9/data/rules/hplip-printer@.service diff -up hplip-3.15.11/data/rules/hplip-printer@.service.udev-rules hplip-3.15.11/data/rules/hplip-printer@.service
--- hplip-3.15.9/data/rules/hplip-printer@.service.udev-rules 2015-09-14 15:39:40.000000000 +0200 --- hplip-3.15.11/data/rules/hplip-printer@.service.udev-rules 2015-11-12 11:28:50.000000000 +0100
+++ hplip-3.15.9/data/rules/hplip-printer@.service 2015-09-25 14:04:40.712096091 +0200 +++ hplip-3.15.11/data/rules/hplip-printer@.service 2015-11-18 13:41:08.003952433 +0100
@@ -2,4 +2,4 @@ @@ -2,4 +2,4 @@
Description=Configure HP Plugged-In Printer Description=Configure HP Plugged-In Printer
[Service] [Service]
-ExecStart=/usr/bin/python /usr/bin/hp-config_usb_printer "%i" -ExecStart=/usr/bin/python /usr/bin/hp-config_usb_printer "%i"
+ExecStart=/usr/bin/hp-config_usb_printer "%i" +ExecStart=/usr/bin/hp-config_usb_printer "%i"
diff -up hplip-3.15.9/Makefile.in.udev-rules hplip-3.15.9/Makefile.in diff -up hplip-3.15.11/Makefile.am.udev-rules hplip-3.15.11/Makefile.am
--- hplip-3.15.9/Makefile.in.udev-rules 2015-09-14 15:42:57.000000000 +0200 --- hplip-3.15.11/Makefile.am.udev-rules 2015-11-12 11:29:04.000000000 +0100
+++ hplip-3.15.9/Makefile.in 2015-09-25 14:03:52.045159501 +0200 +++ hplip-3.15.11/Makefile.am 2015-11-18 13:54:18.817431087 +0100
@@ -2471,6 +2471,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-lase @@ -118,11 +118,12 @@ rulessystemdir=/usr/lib/systemd/system
am__dist_prnt_DATA_DIST = prnt/cups.py prnt/__init__.py prnt/ldl.py \ dist_rulessystem_DATA =data/rules/hplip-printer@.service
prnt/pcl.py prnt/colorcal.py
am__dist_rules_DATA_DIST = data/rules/56-hpmud.rules \
+ data/rules/56-hp_conf_usb.rules \
data/rules/56-hpmud_sysfs.rules
am__dist_rulessystem_DATA_DIST = data/rules/hplip-printer@.service
am__dist_scan_DATA_DIST = scan/__init__.py scan/sane.py
@@ -4623,8 +4624,8 @@ cups_drv = prnt/drv/hpcups.drv
@HPLIP_BUILD_TRUE@dist_rulessystem_DATA = data/rules/hplip-printer@.service
# hpmud.rules # hpmud.rules
-@HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d -rulesdir = /etc/udev/rules.d
-@HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE@dist_rules_DATA = data/rules/56-hpmud.rules +rulesdir = /usr/lib/udev/rules.d
+@HPLIP_BUILD_TRUE@rulesdir = /usr/lib/udev/rules.d if UDEV_SYSFS_RULES
+@HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE@dist_rules_DATA = data/rules/56-hpmud.rules data/rules/56-hp_conf_usb.rules dist_rules_DATA = data/rules/56-hpmud_sysfs.rules
@HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@dist_rules_DATA = data/rules/56-hpmud_sysfs.rules else
@HPLIP_BUILD_TRUE@halpredir = /usr/share/hal/fdi/preprobe/10osvendor dist_rules_DATA = data/rules/56-hpmud.rules
@HPLIP_BUILD_TRUE@dist_halpre_DATA = data/rules/20-hplip-devices.fdi +dist_rules_DATA += data/rules/56-hp_conf_usb.rules
endif
halpredir = /usr/share/hal/fdi/preprobe/10osvendor

20
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.15.11 Version: 3.15.11
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ and MIT and BSD License: GPLv2+ and MIT and BSD
Url: http://hplip.sourceforge.net/ Url: http://hplip.sourceforge.net/
@ -44,6 +44,7 @@ Requires: wget
Requires: python3-dbus Requires: python3-dbus
Requires: gnupg Requires: gnupg
BuildRequires: autoconf automake libtool
BuildRequires: net-snmp-devel BuildRequires: net-snmp-devel
BuildRequires: cups-devel BuildRequires: cups-devel
BuildRequires: python3-devel BuildRequires: python3-devel
@ -219,6 +220,10 @@ sed -i.env-python -e 's,^#!/usr/bin/env python,#!%{__python3},' \
fax/filters/pstotiff fax/filters/pstotiff
%build %build
# work-around rpaths errors
sed -i 's|^AM_INIT_AUTOMAKE|AM_INIT_AUTOMAKE([foreign])|g' configure.in
autoreconf --verbose --force --install
%configure \ %configure \
--enable-scan-build --enable-gui-build --enable-fax-build \ --enable-scan-build --enable-gui-build --enable-fax-build \
--disable-foomatic-rip-hplip-install --enable-pp-build \ --disable-foomatic-rip-hplip-install --enable-pp-build \
@ -227,18 +232,16 @@ sed -i.env-python -e 's,^#!/usr/bin/env python,#!%{__python3},' \
--enable-hpijs-install \ --enable-hpijs-install \
--disable-policykit --with-mimedir=%{_datadir}/cups/mime PYTHON=%{__python3} --disable-policykit --with-mimedir=%{_datadir}/cups/mime PYTHON=%{__python3}
# FIXME: uncomment these once libhpdiscovery rpath problems are resolved ! make %{?_smp_mflags}
#sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
#sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make
%install %install
mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_bindir}
make install DESTDIR=%{buildroot} PYTHON=%{__python3} make install DESTDIR=%{buildroot} PYTHON=%{__python3}
# Create /run/hplip # Create /run/hplip & /var/lib/hp
mkdir -p %{buildroot}/run/hplip mkdir -p %{buildroot}/run/hplip
mkdir -p %{buildroot}%{_sharedstatedir}/hp
# install /usr/lib/tmpfiles.d/hplip.conf (bug #1015831) # install /usr/lib/tmpfiles.d/hplip.conf (bug #1015831)
mkdir -p %{buildroot}%{_tmpfilesdir} mkdir -p %{buildroot}%{_tmpfilesdir}
@ -402,7 +405,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%{_datadir}/hplip/prnt %{_datadir}/hplip/prnt
%{_datadir}/hplip/scan %{_datadir}/hplip/scan
%{_datadir}/ppd %{_datadir}/ppd
%{_localstatedir}/lib/hp %{_sharedstatedir}/hp
%dir %attr(0775,root,lp) /run/hplip %dir %attr(0775,root,lp) /run/hplip
%{_tmpfilesdir}/hplip.conf %{_tmpfilesdir}/hplip.conf
%{_udevrulesdir}/56-hp_conf_usb.rules %{_udevrulesdir}/56-hp_conf_usb.rules
@ -453,6 +456,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%postun libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig
%changelog %changelog
* Wed Nov 18 2015 Jiri Popelka <jpopelka@redhat.com> - 3.15.11-2
- run autoreconf instead of patching libtool script to work-around rpath issues
* Mon Nov 16 2015 Jiri Popelka <jpopelka@redhat.com> - 3.15.11-1 * Mon Nov 16 2015 Jiri Popelka <jpopelka@redhat.com> - 3.15.11-1
- 3.15.11 - 3.15.11