Test for /run/systemd rather than calling rpm in %pre
This commit is contained in:
parent
4beb3d91e3
commit
516be49262
@ -4,7 +4,7 @@
|
||||
Summary: Tools for searching and reading man pages
|
||||
Name: man-db
|
||||
Version: 2.7.1
|
||||
Release: 4%{?dist}
|
||||
Release: 5%{?dist}
|
||||
# GPLv2+ .. man-db
|
||||
# GPLv3+ .. gnulib
|
||||
License: GPLv2+ and GPLv3+
|
||||
@ -77,8 +77,7 @@ install -D -p -m 0644 init/systemd/man-db.conf $RPM_BUILD_ROOT/usr/lib/tmpfiles.
|
||||
|
||||
# stop and disable timer from previous builds
|
||||
%pre
|
||||
rpm -q systemd > /dev/null
|
||||
if [ "$?" -eq 0 ]; then
|
||||
if test -d /run/systemd; then
|
||||
systemctl stop man-db.timer
|
||||
systemctl -q disable man-db.timer
|
||||
fi
|
||||
@ -134,6 +133,10 @@ fi
|
||||
%lang(zh_CN) %{_datadir}/man/zh_CN/man*/*
|
||||
|
||||
%changelog
|
||||
* Tue May 12 2015 Colin Walters <walters@redhat.com> - 2.7.1-5
|
||||
- Test for /run/systemd to detect systemd state rather than invoking
|
||||
rpm in % pre - it is not really supported by rpm.
|
||||
|
||||
* Sat Feb 21 2015 Till Maas <opensource@till.name> - 2.7.1-4
|
||||
- Rebuilt for Fedora 23 Change
|
||||
https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
|
||||
|
Loading…
Reference in New Issue
Block a user