diff --git a/hplip-udev-rules.patch b/hplip-udev-rules.patch index 9e2ab4a..d833bb6 100644 --- a/hplip-udev-rules.patch +++ b/hplip-udev-rules.patch @@ -1,35 +1,7 @@ -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.11/data/rules/56-hp_conf_usb.rules.udev-rules 2015-11-18 13:41:08.003952433 +0100 -+++ hplip-3.15.11/data/rules/56-hp_conf_usb.rules 2015-11-18 13:41:08.003952433 +0100 -@@ -0,0 +1,4 @@ -+# HPLIP udev rules file. -+ -+# 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'" -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.11/data/rules/56-hpmud.rules.udev-rules 2015-11-12 11:28:50.000000000 +0100 -+++ 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 - # 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" - --# 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 '/usr/bin/nohup /usr/bin/hp-config_usb_printer $env{BUSNUM}:$env{DEVNUM}'" -- - LABEL="hpmud_rules_end" -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.11/data/rules/hplip-printer@.service.udev-rules 2015-11-12 11:28:50.000000000 +0100 -+++ hplip-3.15.11/data/rules/hplip-printer@.service 2015-11-18 13:41:08.003952433 +0100 -@@ -2,4 +2,4 @@ - Description=Configure HP Plugged-In Printer - - [Service] --ExecStart=/usr/bin/python /usr/bin/hp-config_usb_printer "%i" -+ExecStart=/usr/bin/hp-config_usb_printer "%i" diff -up hplip-3.15.11/Makefile.am.udev-rules hplip-3.15.11/Makefile.am --- hplip-3.15.11/Makefile.am.udev-rules 2015-11-12 11:29:04.000000000 +0100 -+++ hplip-3.15.11/Makefile.am 2015-11-18 13:54:18.817431087 +0100 -@@ -118,11 +118,12 @@ rulessystemdir=/usr/lib/systemd/system ++++ hplip-3.15.11/Makefile.am 2015-12-10 12:43:11.518518146 +0100 +@@ -118,7 +118,7 @@ rulessystemdir=/usr/lib/systemd/system dist_rulessystem_DATA =data/rules/hplip-printer@.service # hpmud.rules @@ -38,8 +10,3 @@ diff -up hplip-3.15.11/Makefile.am.udev-rules hplip-3.15.11/Makefile.am if UDEV_SYSFS_RULES dist_rules_DATA = data/rules/56-hpmud_sysfs.rules else - dist_rules_DATA = data/rules/56-hpmud.rules -+dist_rules_DATA += data/rules/56-hp_conf_usb.rules - endif - - halpredir = /usr/share/hal/fdi/preprobe/10osvendor diff --git a/hplip.spec b/hplip.spec index 836d064..e1a2adc 100644 --- a/hplip.spec +++ b/hplip.spec @@ -7,7 +7,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.15.11 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and MIT and BSD Url: http://hplip.sourceforge.net/ @@ -43,6 +43,8 @@ Requires: cups Requires: wget Requires: python3-dbus Requires: gnupg +# /usr/lib/udev/rules.d +Requires: systemd BuildRequires: autoconf automake libtool BuildRequires: net-snmp-devel @@ -72,8 +74,6 @@ drivers for HP printers and multi-function peripherals. %package common Summary: Files needed by the HPLIP printer and scanner drivers License: GPLv2+ -# /usr/lib/udev/rules.d -Requires: systemd %description common Files needed by the HPLIP printer and scanner drivers. @@ -137,8 +137,6 @@ mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs} prnt/drv/hpijs.drv.in.deviceIDs-drv-hpijs \ > prnt/drv/hpijs.drv.in -# Move udev rule for calling hp-config_usb_printer into separate file. -# Don't specify python version in hplip-printer@.service. # Move udev rules from /etc/ to /usr/lib/ (bug #748208). %patch6 -p1 -b .udev-rules @@ -314,6 +312,7 @@ rm -f %{buildroot}%{_bindir}/hp-upgrade rm -f %{buildroot}%{_datadir}/hplip/hpijs.drv.in.template rm -f %{buildroot}%{_datadir}/cups/mime/pstotiff.types rm -f %{buildroot}%{_datadir}/hplip/fax/pstotiff* +rm -f %{buildroot}%{_unitdir}/hplip-printer@.service # The systray applet doesn't work properly (displays icon as a # window), so don't ship the launcher yet. @@ -411,12 +410,10 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %{_sharedstatedir}/hp %dir %attr(0775,root,lp) /run/hplip %{_tmpfilesdir}/hplip.conf -%{_udevrulesdir}/56-hp_conf_usb.rules -%{_unitdir}/hplip-printer@.service +%{_udevrulesdir}/56-hpmud.rules %files common -%doc COPYING -%{_udevrulesdir}/56-hpmud.rules +%license COPYING %dir %{_sysconfdir}/hp %config(noreplace) %{_sysconfdir}/hp/hplip.conf %dir %{_datadir}/hplip @@ -459,6 +456,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %postun libs -p /sbin/ldconfig %changelog +* Thu Dec 10 2015 Jiri Popelka - 3.15.11-3 +- move 56-hpmud.rules into main package completely (bug #1033952) + * Wed Nov 18 2015 Jiri Popelka - 3.15.11-2 - run autoreconf instead of patching libtool script to work-around rpath issues