[packages/tmpwatch] Add systemd-cronjobs support

jajcus jajcus at pld-linux.org
Fri Mar 10 14:25:08 CET 2017


commit 0cb3b9b108ba848b11c8fb836bf243edc00def59
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date:   Fri Mar 10 14:22:59 2017 +0100

    Add systemd-cronjobs support
    
    Release: 10

 cronjob-tmpwatch.service |  5 +++++
 cronjob-tmpwatch.timer   |  8 ++++++++
 tmpwatch.spec            | 26 +++++++++++++++++++++++---
 3 files changed, 36 insertions(+), 3 deletions(-)
---
diff --git a/tmpwatch.spec b/tmpwatch.spec
index 33ac929..4fbfb41 100644
--- a/tmpwatch.spec
+++ b/tmpwatch.spec
@@ -11,7 +11,7 @@ Summary(ru.UTF-8):	Утилита удаления файлов по крите
 Summary(uk.UTF-8):	Утиліта видалення файлів за критерієм давності останнього доступу
 Name:		tmpwatch
 Version:	2.11
-Release:	9
+Release:	10
 License:	GPL v2
 Group:		Applications/System
 Source0:	https://fedorahosted.org/releases/t/m/tmpwatch/%{name}-%{version}.tar.bz2
@@ -20,11 +20,15 @@ Source1:	%{name}.sysconfig
 Source2:	%{name}.cron
 Source3:	%{name}.conf
 Source4:	%{name}.crontab
+Source5:	cronjob-%{name}.timer
+Source6:	cronjob-%{name}.service
 Patch0:		%{name}-boottime.patch
 URL:		https://fedorahosted.org/tmpwatch/
 BuildRequires:	autoconf >= 2.64
 BuildRequires:	automake
-Suggests:	crondaemon
+BuildRequires:	rpmbuild(macros) >= 1.644
+Requires:	systemd-units >= 38
+Suggests:	cronjobs
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -103,7 +107,7 @@ gözönüne almadan dizinleri rekürsif olarak arar ve kullanıcının
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{cron.d,sysconfig,%{name}},%{_prefix}/lib,%{_sbindir}}
+install -d $RPM_BUILD_ROOT{/etc/{cron.d,sysconfig,%{name}},%{_prefix}/lib,%{_sbindir},%{systemdunitdir}}
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
@@ -114,9 +118,20 @@ cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/cron.d/%{name}
 cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/tmpwatch/common.conf
 install -p %{SOURCE2} $RPM_BUILD_ROOT%{_prefix}/lib/tmpwatch
 
+cp -p %{SOURCE5} %{SOURCE6} $RPM_BUILD_ROOT%{systemdunitdir}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%systemd_post cronjob-%{name}.timer
+
+%preun
+%systemd_preun cronjob-%{name}.timer
+
+%postun
+%systemd_reload
+
 %triggerpostun -- %{name} < 2.9.1-4
 if [ -f /usr/sbin/amavisd ]; then
 	echo "WARNING!! Take a look at /etc/sysconfig/%{name}"
@@ -133,6 +148,9 @@ if [ ! -e /etc/cron.daily/tmpwatch.directories ]; then
 	echo DISABLE_TMPWATCH_CRON_DIRS=yes >> /etc/sysconfig/tmpwatch
 fi
 
+%triggerpostun -- %{name} < 2.11-10
+%systemd_service_enable cronjob-%{name}.timer
+
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog NEWS README
@@ -143,3 +161,5 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/%{name}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/tmpwatch
 %{_mandir}/man8/tmpwatch.8*
+%{systemdunitdir}/cronjob-%{name}.service
+%{systemdunitdir}/cronjob-%{name}.timer
diff --git a/cronjob-tmpwatch.service b/cronjob-tmpwatch.service
new file mode 100644
index 0000000..7401da0
--- /dev/null
+++ b/cronjob-tmpwatch.service
@@ -0,0 +1,5 @@
+[Unit]
+Description=tmpwatch cronjob
+
+[Service]
+ExecStart=/usr/lib/tmpwatch
diff --git a/cronjob-tmpwatch.timer b/cronjob-tmpwatch.timer
new file mode 100644
index 0000000..1991970
--- /dev/null
+++ b/cronjob-tmpwatch.timer
@@ -0,0 +1,8 @@
+[Unit]
+Description=tmpwatch cronjob timer
+
+[Timer]
+OnCalendar=hourly
+
+[Install]
+WantedBy=cronjobs.target
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/tmpwatch.git/commitdiff/0cb3b9b108ba848b11c8fb836bf243edc00def59



More information about the pld-cvs-commit mailing list