From bb41d6514d0c2189ec8b2d7e437a02edc7bc42a0 Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Tue, 5 Jun 2012 14:41:46 +0200 Subject: [PATCH] Require systemd instead of udev. --- hplip-udev-rules.patch | 2 +- hplip.spec | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hplip-udev-rules.patch b/hplip-udev-rules.patch index 46fd00a..daffcc2 100644 --- a/hplip-udev-rules.patch +++ b/hplip-udev-rules.patch @@ -17,7 +17,7 @@ diff -up hplip-3.12.4/Makefile.in.udev-rules hplip-3.12.4/Makefile.in # hpmud.rules -@HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d -+@HPLIP_BUILD_TRUE@rulesdir = /lib/udev/rules.d ++@HPLIP_BUILD_TRUE@rulesdir = /usr/lib/udev/rules.d @HPLIP_BUILD_TRUE@dist_rules_DATA = data/rules/56-hpmud_support.rules \ @HPLIP_BUILD_TRUE@ data/rules/86-hpmud_plugin.rules \ @HPLIP_BUILD_TRUE@ data/rules/56-hpmud_add_printer.rules \ diff --git a/hplip.spec b/hplip.spec index 5795ecc..cca47ca 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 3.12.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and MIT Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -79,7 +79,8 @@ drivers for HP printers and multi-function peripherals. Summary: Files needed by the HPLIP printer and scanner drivers Group: System Environment/Libraries License: GPLv2+ -Requires: udev +# /usr/lib/udev/rules.d +Requires: systemd %description common Files needed by the HPLIP printer and scanner drivers. @@ -463,7 +464,7 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop %files common %doc COPYING -/lib/udev/rules.d/*.rules +%{_prefix}/lib/udev/rules.d/*.rules %dir %{_sysconfdir}/hp %config(noreplace) %{_sysconfdir}/hp/hplip.conf %dir %{_datadir}/hplip @@ -527,6 +528,9 @@ fi %postun libs -p /sbin/ldconfig %changelog +* Tue Jun 05 2012 Jiri Popelka 3.12.4-3 +- Require systemd instead of udev. + * Mon Apr 30 2012 Tim Waugh 3.12.4-2 - The hpijs sub-package no longer requires cupsddk-drivers (which no longer exists as a real package), but cups >= 1.4.