jchaloup pushed to man-db (f21). "Test for /run/systemd only if mandb.timer is actually installed (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Wed May 20 10:00:59 UTC 2015


From a83d0aaf121fe4dd771cdee3c4ae3523283ffa98 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup at redhat.com>
Date: Wed, 20 May 2015 11:59:24 +0200
Subject: Test for /run/systemd only if mandb.timer is actually installed -
 resolves: #1223244


diff --git a/man-db.spec b/man-db.spec
index 4d92af1..e0a71af 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: 14%{?dist}
+Release: 15%{?dist}
 # GPLv2+ .. man-db
 # GPLv3+ .. gnulib
 License: GPLv2+ and GPLv3+
@@ -83,9 +83,11 @@ install -D -p -m 0644 init/systemd/man-db.conf $RPM_BUILD_ROOT/usr/lib/tmpfiles.
 
 # stop and disable timer from previous builds
 %pre
-if test -d /run/systemd; then
+if [ -e /usr/lib/systemd/system/mandb.timer ]; then
+  if test -d /run/systemd; then
     systemctl stop mandb.timer
     systemctl -q disable mandb.timer
+  fi
 fi
 
 # clear the old cache
@@ -138,6 +140,10 @@ fi
 %lang(zh_CN)   %{_datadir}/man/zh_CN/man*/*
 
 %changelog
+* Wed May 20 2015 jchaloup <jchaloup at redhat.com> - 2.6.7.1-15
+- Test for /run/systemd only if mandb.timer is actually installed
+  resolves: #1223244
+
 * Wed May 13 2015 Cole Robinson <crobinso at redhat.com> 2.6.7.1-14
 - Test for /run/systemd to detect systemd state rather than invoking
   rpm in % pre - it is not really supported by rpm.
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/man-db.git/commit/?h=f21&id=a83d0aaf121fe4dd771cdee3c4ae3523283ffa98


More information about the scm-commits mailing list