- Added /sbin/service and /sbin/chkconfig requirements for the scriptlets

(bug #236445).
- Fixed %post scriptlet's condrestart logic (bug #236445).
- Resolves: rhbz#236445 rhbz#236445
This commit is contained in:
Tim Waugh 2007-04-16 09:31:43 +00:00
parent fcdfcbd958
commit 0732353dd8

View File

@ -24,6 +24,11 @@ Patch8: hplip-libsane.patch
Patch9: hplip-media-empty.patch Patch9: hplip-media-empty.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
Requires(post): /sbin/service
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/service
Requires(preun): /sbin/chkconfig
%define hpijs_epoch 1 %define hpijs_epoch 1
Requires: hpijs = %{hpijs_epoch}:%{version}-%{release} Requires: hpijs = %{hpijs_epoch}:%{version}-%{release}
@ -178,6 +183,8 @@ rm -rf %{buildroot}
%{_bindir}/hp-testpage %{_bindir}/hp-testpage
%{_bindir}/hp-unload %{_bindir}/hp-unload
%{_sbindir}/hpiod %{_sbindir}/hpiod
# Note: this must be /usr/lib not %{_libdir}, since that's the
# CUPS serverbin directory.
/usr/lib/cups/backend/hp /usr/lib/cups/backend/hp
/usr/lib/cups/backend/hpfax /usr/lib/cups/backend/hpfax
%{_libdir}/python*/site-packages/* %{_libdir}/python*/site-packages/*
@ -248,7 +255,7 @@ rm -rf %{buildroot}
%post %post
/sbin/chkconfig --add hplip || : /sbin/chkconfig --add hplip || :
if [ "$1" == "1" ]; then if [ "$1" -ge "1" ]; then
/sbin/service hplip condrestart >/dev/null 2>&1 || : /sbin/service hplip condrestart >/dev/null 2>&1 || :
fi fi
exit 0 exit 0
@ -272,6 +279,11 @@ fi
exit 0 exit 0
%changelog %changelog
* Mon Apr 16 2007 Tim Waugh <twaugh@redhat.com>
- Added /sbin/service and /sbin/chkconfig requirements for the scriptlets
(bug #236445).
- Fixed %%post scriptlet's condrestart logic (bug #236445).
* Fri Apr 13 2007 Tim Waugh <twaugh@redhat.com> 1.7.2-6 * Fri Apr 13 2007 Tim Waugh <twaugh@redhat.com> 1.7.2-6
- Fixed dangling symlinks (bug #236156). - Fixed dangling symlinks (bug #236156).
- Move all fax bits to the gui package (bug #236161). - Move all fax bits to the gui package (bug #236161).