- use newer systemd macros

[packages/cronie.git] / cronie.spec

diff --git a/cronie.spec b/cronie.spec
index 7d8e9739f64b8e9ec26a72fdcdb9f5da285436f7..1bc36549eaa6c67e6e09f5a51f43e2af3b5f3455 100644 (file)
--- a/cronie.spec
+++ b/cronie.spec
@@ -16,18 +16,19 @@
 
 Summary:       Cron daemon for executing programs at set times
 Name:          cronie
-Version:       1.4.6
-Release:       2
+Version:       1.4.8
+Release:       8
 License:       MIT and BSD and GPL v2
 Group:         Daemons
 Source0:       https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz
-# Source0-md5: 968e3d3e7c8e1d0588d533883482d3fa
+# Source0-md5: 9b1d2ce6db8d1883e06635f437170657
 Source1:       %{name}.init
 Source2:       cron.logrotate
 Source3:       cron.sysconfig
 Source4:       %{name}.crontab
 Source5:       %{name}.pam
 Source6:       %{name}.upstart
+Source7:       crond.service
 Patch0:                inotify-nosys.patch
 Patch1:                %{name}-nosyscrontab.patch
 Patch2:                sendmail-path.patch
@@ -38,14 +39,13 @@ BuildRequires:      automake
 %{?with_selinux:BuildRequires: libselinux-devel}
 BuildRequires: pam-devel
 BuildRequires: rpm >= 4.4.9-56
-BuildRequires: rpmbuild(macros) >= 1.561
+BuildRequires: rpmbuild(macros) >= 1.626
 Requires(post):        fileutils
 Requires(post,preun):  /sbin/chkconfig
 Requires(postun):      /usr/sbin/groupdel
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires:      /bin/run-parts
-Requires:      /sbin/chkconfig
 Requires:      psmisc >= 20.1
 Requires:      rc-scripts >= 0.4.3.0
 %{?with_inotify:Requires:      uname(release) >= 2.6.13}
@@ -53,12 +53,12 @@ Provides:   crondaemon
 Provides:      crontabs = 1.7
 Provides:      group(crontab)
 %if "%{pld_release}" == "th"
-Provides:      vixie-cron = 4:4.4
+Provides:      vixie-cron = 4.3-1
 %endif
 Obsoletes:     crondaemon
 Obsoletes:     crontabs
 %if "%{pld_release}" == "th"
-Obsoletes:     vixie-cron <= 4:4.3
+Obsoletes:     vixie-cron < 4.3-1
 %endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -92,6 +92,15 @@ Upstart job description for Cronie.
 %description upstart -l pl.UTF-8
 Opis zadania Upstart dla Cronie.
 
+%package systemd
+Summary:       systemd units for cronie
+Group:         Base
+Requires:      %{name} = %{version}-%{release}
+Requires:      systemd-units >= 37-0.10
+
+%description systemd
+systemd units for cronie.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -111,13 +120,15 @@ Opis zadania Upstart dla Cronie.
        --with%{!?with_selinux:out}-selinux \
        --with%{!?with_audit:out}-audit \
        --with%{!?with_inotify:out}-inotify \
+       --enable-pie \
+       --enable-relro \
        --enable-anacron
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/var/{log,spool/{ana,}cron},%{_mandir}} \
+install -d $RPM_BUILD_ROOT{/var/{log,spool/{ana,}cron},%{_mandir},/lib/systemd/system}\
        $RPM_BUILD_ROOT/etc/{rc.d/init.d,logrotate.d,sysconfig,init} \
        $RPM_BUILD_ROOT%{_sysconfdir}/{cron,cron.{d,hourly,daily,weekly,monthly},pam.d}
 
@@ -132,6 +143,8 @@ cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/cron
 cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/cron.d/crontab
 cp -a %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/crond
 cp -a %{SOURCE6} $RPM_BUILD_ROOT/etc/init/crond.conf
+cp -a %{SOURCE7} $RPM_BUILD_ROOT%{systemdunitdir}/cronie.service
+ln -s cronie.service $RPM_BUILD_ROOT%{systemdunitdir}/crond.service
 
 touch $RPM_BUILD_ROOT/var/log/cron
 
@@ -170,12 +183,6 @@ if [ "$1" = "0" ]; then
        %groupremove crontab
 fi
 
-%triggerin -- pam
-# restart crond if pam is upgraded
-if [ "$2" != 1 ]; then
-       %service -q crond restart
-fi
-
 %triggerun -- hc-cron,fcron,vixie-cron
 # Prevent preun from crond from working
 chmod a-x /etc/rc.d/init.d/crond
@@ -193,6 +200,15 @@ chmod 754 /etc/rc.d/init.d/crond
 %postun upstart
 %upstart_postun crond
 
+%post systemd
+%systemd_post cronie.service
+
+%preun systemd
+%systemd_preun cronie.service
+
+%postun systemd
+%systemd_reload
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README
@@ -224,6 +240,13 @@ chmod 754 /etc/rc.d/init.d/crond
 
 %attr(1730,root,crontab) /var/spool/anacron
 
+%if "%{pld_release}" != "ti"
 %files upstart
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) /etc/init/crond.conf
+%endif
+
+%files systemd
+%defattr(644,root,root,755)
+%{systemdunitdir}/crond.service
+%{systemdunitdir}/cronie.service