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

[notifications at fedoraproject.org]

From ab9c4ea572406cebe9f771f6e9a0781951b270e3 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup at redhat.com>
Date: Wed, 20 May 2015 12:25:25 +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 6c326a5..6e16965 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.7.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 # GPLv2+ .. man-db
 # GPLv3+ .. gnulib
 License: GPLv2+ and GPLv3+
@@ -77,9 +77,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 man-db.timer
 	systemctl -q disable man-db.timer
+  fi
 fi
 
 # clear the old cache
@@ -133,6 +135,10 @@ fi
 %lang(zh_CN)   %{_datadir}/man/zh_CN/man*/*
 
 %changelog
+* Wed May 20 2015 jchaloup <jchaloup at redhat.com> - 2.7.1-6
+- Test for /run/systemd only if mandb.timer is actually installed
+  resolves: #1223244
+
 * Tue May 12 2015 Colin Walters <walters at 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.
-- 
cgit v0.10.2


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