[man-db/f21] preun missing condition on number of man-db packages installed - related: #1148559
Jan Chaloupka
jchaloup at fedoraproject.org
Mon Oct 13 12:11:00 UTC 2014
commit 049163fea8107a27c311fa88e00da5e65241961e
Author: Jan Chaloupka <jchaloup at redhat.com>
Date: Mon Oct 13 14:08:16 2014 +0200
preun missing condition on number of man-db packages installed
- related: #1148559
man-db.spec | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
---
diff --git a/man-db.spec b/man-db.spec
index c7fa8b1..20c9e68 100644
--- a/man-db.spec
+++ b/man-db.spec
@@ -4,7 +4,7 @@
Summary: Tools for searching and reading man pages
Name: man-db
Version: 2.6.7.1
-Release: 9%{?dist}
+Release: 10%{?dist}
# GPLv2+ .. man-db
# GPLv3+ .. gnulib
License: GPLv2+ and GPLv3+
@@ -69,8 +69,8 @@ install -d -m 0755 $RPM_BUILD_ROOT%{cache}
# install systemd service and timer files for man-db creation/update
mkdir -p %{buildroot}%{_unitdir}
-install -D -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/%{name}.service
-install -D -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/%{name}.timer
+install -D -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/mandb.service
+install -D -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/mandb.timer
# config for tmpfiles.d
install -D -p -m 0644 init/systemd/man-db.conf $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/.
@@ -82,21 +82,23 @@ install -D -p -m 0644 init/systemd/man-db.conf $RPM_BUILD_ROOT/usr/lib/tmpfiles.
%post
%{__rm} -rf %{cache}/*
# enable and start timer
-systemctl -q enable man-db.timer
-systemctl start man-db.timer
+systemctl -q enable mandb.timer
+systemctl start mandb.timer
%preun
# stop and disable timer
-systemctl stop man-db.timer
-systemctl -q disable man-db.timer
+if [ "$1" -eq 0 ]; then
+ systemctl stop mandb.timer
+ systemctl -q disable mandb.timer
+fi
%files -f %{name}.lang -f %{name}-gnulib.lang
%{!?_licensedir:%global license %%doc}
%license docs/COPYING
%doc README man-db-manual.txt man-db-manual.ps ChangeLog NEWS
%config(noreplace) %{_sysconfdir}/man_db.conf
-%{_unitdir}/man-db.service
-%{_unitdir}/man-db.timer
+%{_unitdir}/mandb.service
+%{_unitdir}/mandb.timer
%config(noreplace) /usr/lib/tmpfiles.d/man-db.conf
%{_sbindir}/accessdb
%{_bindir}/man
@@ -136,6 +138,10 @@ systemctl -q disable man-db.timer
%lang(zh_CN) %{_datadir}/man/zh_CN/man*/*
%changelog
+* Mon Oct 13 2014 jchaloup <jchaloup at redhat.com> - 2.6.7.1-10
+- preun missing condition on number of man-db packages installed
+ related: #1148559
+
* Sun Oct 12 2014 jchaloup <jchaloup at redhat.com> - 2.6.7.1-9
- remove executable flag for *.service and *.timer file
related: #1148559
More information about the scm-commits
mailing list