rpms/man-db
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Test for /run/systemd rather than calling rpm in %pre

Browse Source
This commit is contained in:
Colin Walters 2015-05-12 15:42:02 -04:00
parent 4beb3d91e3
commit 516be49262
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
man-db.spec
View File

@ -4,7 +4,7 @@
Summary: Tools for searching and reading man pages Summary: Tools for searching and reading man pages
Name: man-db Name: man-db
Version: 2.7.1 Version: 2.7.1
Release: 4%{?dist} Release: 5%{?dist}
# GPLv2+ .. man-db # GPLv2+ .. man-db
# GPLv3+ .. gnulib # GPLv3+ .. gnulib
License: GPLv2+ and GPLv3+ 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 # stop and disable timer from previous builds
%pre %pre
rpm -q systemd > /dev/null if test -d /run/systemd; then
if [ "$?" -eq 0 ]; then
systemctl stop man-db.timer systemctl stop man-db.timer
systemctl -q disable man-db.timer systemctl -q disable man-db.timer
fi fi
@ -134,6 +133,10 @@ fi
%lang(zh_CN) %{_datadir}/man/zh_CN/man*/* %lang(zh_CN) %{_datadir}/man/zh_CN/man*/*
%changelog %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 * Sat Feb 21 2015 Till Maas <opensource@till.name> - 2.7.1-4
- Rebuilt for Fedora 23 Change - Rebuilt for Fedora 23 Change
https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code