[packages/logrotate] Use %%systemd_service_enable instead of %%systemd_trigger

jajcus jajcus at pld-linux.org
Fri Mar 10 14:09:22 CET 2017


commit 3134256f98be98df88416152c138dfc402ec0ee4
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date:   Fri Mar 10 14:04:16 2017 +0100

    Use %%systemd_service_enable instead of %%systemd_trigger
    
    The latter won't work for cronjobs, as it checks if a matching init.d
    service was enabled.
    
    Release: 3

 cronjob-logrotate.timer | 2 +-
 logrotate.spec          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/logrotate.spec b/logrotate.spec
index 8aa28ff..344c725 100644
--- a/logrotate.spec
+++ b/logrotate.spec
@@ -20,7 +20,7 @@ Summary(tr.UTF-8):	Sistem günlüklerini yönlendirir, sıkıştırır ve mektup
 Summary(uk.UTF-8):	Ротує, компресує, видаляє та відправляє поштою лог-файли
 Name:		logrotate
 Version:	3.11.0
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		Applications/System
 Source0:	https://github.com/logrotate/logrotate/releases/download/%{version}/%{name}-%{version}.tar.xz
@@ -173,8 +173,8 @@ fi
 %triggerpostun -- %{name} < 3.7.8-4
 %{__sed} -i -e 's,olddir /var/log/archiv$,olddir /var/log/archive,' %{_sysconfdir}/%{name}.conf %{_sysconfdir}/logrotate.d/* || :
 
-%triggerpostun -- %{name} < 3.11.0-1.1
-%systemd_trigger %{name}.timer
+%triggerpostun -- %{name} < 3.11.0-3
+%systemd_service_enable cronjob-%{name}.timer
 
 %post
 if [ -f /var/lib/logrotate.status ]; then
diff --git a/cronjob-logrotate.timer b/cronjob-logrotate.timer
index bfb2194..1dd799c 100644
--- a/cronjob-logrotate.timer
+++ b/cronjob-logrotate.timer
@@ -1,5 +1,5 @@
 [Unit]
-Description=logrotate cron job
+Description=logrotate cron job timer
 
 [Timer]
 OnCalendar=*-*-* 05:02:00
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/logrotate.git/commitdiff/3134256f98be98df88416152c138dfc402ec0ee4



More information about the pld-cvs-commit mailing list