[packages/man-db] Release: 3. Disabled duplicate systemd timer.
matkor
matkor at pld-linux.org
Wed Apr 5 11:37:06 CEST 2017
commit 99865d54cb84e9e98ce335cceb9d8a23648af195
Author: Mateusz Korniak <matkor at pld-linux.org>
Date: Wed Apr 5 11:36:53 2017 +0200
Release: 3. Disabled duplicate systemd timer.
man-db.spec | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/man-db.spec b/man-db.spec
index 13ab0bb..0bac9c2 100644
--- a/man-db.spec
+++ b/man-db.spec
@@ -6,7 +6,7 @@ Summary: Tools for searching and reading man pages
Summary(pl.UTF-8): Narzędzia do przeszukiwania i czytania stron podręcznika man
Name: man-db
Version: 2.7.3
-Release: 2.1
+Release: 3
# project man-db GPLv2+
# Gnulib part GPLv3+
License: GPL v2+ and GPL v3+
@@ -15,8 +15,11 @@ Source0: http://download.savannah.gnu.org/releases/man-db/%{name}-%{version}.tar
# Source0-md5: df898c82d766dad6492a5a96d5a26647
Source1: %{name}.daily
Source2: %{name}.sysconfig
-Source3: cronjob-%{name}.timer
-Source4: cronjob-%{name}.service
+# NOTE: .timer/.service not needed, as there is /etc/cron.daily script, which will
+# be called by systemd-cronjobs anyway
+# Provide package crontab instead to enable systemd timer.
+# Source3: cronjob-%{name}.timer
+# Source4: cronjob-%{name}.service
# Resolves: #655385 - use old format of nroff output
Patch0: sgr.patch
@@ -107,9 +110,9 @@ install -D -p %{SOURCE1} $RPM_BUILD_ROOT/etc/cron.daily/man-db.cron
install -D -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/man-db
# systemd timers
-install -d $RPM_BUILD_ROOT%{systemdunitdir}
-install -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdunitdir}/cronjob-%{name}.timer
-install -p %{SOURCE4} $RPM_BUILD_ROOT%{systemdunitdir}/cronjob-%{name}.service
+# install -d $RPM_BUILD_ROOT%{systemdunitdir}
+# install -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdunitdir}/cronjob-%{name}.timer
+# install -p %{SOURCE4} $RPM_BUILD_ROOT%{systemdunitdir}/cronjob-%{name}.service
cat <<EOF > $RPM_BUILD_ROOT%{systemdtmpfilesdir}/man-db.conf
@@ -153,8 +156,8 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/man-db/globbing
%{_libdir}/man-db/manconv
%{systemdtmpfilesdir}/man-db.conf
-%{systemdunitdir}/cronjob-%{name}.service
-%{systemdunitdir}/cronjob-%{name}.timer
+# %%{systemdunitdir}/cronjob-%{name}.service
+# %%{systemdunitdir}/cronjob-%{name}.timer
%dir %{cache}
# documentation and translation
%{_mandir}/man1/apropos.1*
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/man-db.git/commitdiff/99865d54cb84e9e98ce335cceb9d8a23648af195
More information about the pld-cvs-commit
mailing list