diff --git a/hplip.spec b/hplip.spec index 9997747..97c15d2 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,13 +1,14 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 0.9.4 -Release: 2 +Release: 3 License: GPL/MIT/BSD Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 Url: http://sourceforge.net/projects/hpinkjet Source: http://kent.dl.sourceforge.net/sourceforge/hpinkjet/%{name}-%{version}.tar.gz +Patch1: hplip-condrestart.patch Patch2: hplip-desktop.patch Patch3: hplip-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot @@ -51,6 +52,9 @@ SANE driver for scanners in HP's multi-function devices (from HPOJ). rm -rf $RPM_BUILD_DIR/%{name}-%{version} %setup -q +# Fix condrestart in the initscript. +%patch1 -p1 -b .condrestart + # Use /usr/share/applications for putting desktop files in. %patch2 -p1 -b .desktop @@ -137,6 +141,9 @@ if ! grep ^hpaio /etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \ fi %changelog +* Tue Jul 26 2005 Tim Waugh 0.9.4-3 +- Fix condrestart in the initscript. + * Mon Jul 25 2005 Tim Waugh 0.9.4-2 - Use 'condrestart' not 'restart' in %%post scriptlet.