X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=cronie.spec;h=bc93a254ea4dc75fd30790b8a43a7d9ecdd5c702;hb=5ab1b51097354f3c27dd248cf0c92df4d1d00d69;hp=3f06dd92b7b5c490cc8d7373afb7e885f5976983;hpb=64e4eafc37fa9d37a292122c904eade743c61801;p=packages%2Fcronie.git

diff --git a/cronie.spec b/cronie.spec
index 3f06dd9..bc93a25 100644
--- a/cronie.spec
+++ b/cronie.spec
@@ -16,17 +16,18 @@
 
 Summary:	Cron daemon for executing programs at set times
 Name:		cronie
-Version:	1.4.4
-Release:	3
+Version:	1.4.7
+Release:	1
 License:	MIT and BSD and GPL v2
 Group:		Daemons
 Source0:	https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz
-# Source0-md5:	eb9834c5f87cca9efeed68e6fed3fe3d
+# Source0-md5:	dfc26c47756d0c40ee27ae3c7ee98e0d
 Source1:	%{name}.init
 Source2:	cron.logrotate
 Source3:	cron.sysconfig
 Source4:	%{name}.crontab
 Source5:	%{name}.pam
+Source6:	%{name}.upstart
 Patch0:		inotify-nosys.patch
 Patch1:		%{name}-nosyscrontab.patch
 Patch2:		sendmail-path.patch
@@ -37,7 +38,7 @@ BuildRequires:	automake
 %{?with_selinux:BuildRequires:	libselinux-devel}
 BuildRequires:	pam-devel
 BuildRequires:	rpm >= 4.4.9-56
-BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	rpmbuild(macros) >= 1.561
 Requires(post):	fileutils
 Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/groupdel
@@ -46,7 +47,7 @@ Requires(pre):	/usr/sbin/groupadd
 Requires:	/bin/run-parts
 Requires:	/sbin/chkconfig
 Requires:	psmisc >= 20.1
-Requires:	rc-scripts >= 0.4.0.19
+Requires:	rc-scripts >= 0.4.3.0
 %{?with_inotify:Requires:	uname(release) >= 2.6.13}
 Provides:	crondaemon
 Provides:	crontabs = 1.7
@@ -78,6 +79,19 @@ Anacron becames part of cronie. Anacron is used only for running
 regular jobs. The default settings execute regular jobs by anacron,
 however this could be overloaded in settings.
 
+%package upstart
+Summary:	Upstart job description for Cronie
+Summary(pl.UTF-8):	Opis zadania Upstart dla Cronie
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+Requires:	upstart >= 0.6
+
+%description upstart
+Upstart job description for Cronie.
+
+%description upstart -l pl.UTF-8
+Opis zadania Upstart dla Cronie.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -97,6 +111,8 @@ however this could be overloaded in settings.
 	--with%{!?with_selinux:out}-selinux \
 	--with%{!?with_audit:out}-audit \
 	--with%{!?with_inotify:out}-inotify \
+	--enable-pie \
+	--enable-relro \
 	--enable-anacron
 
 %{__make}
@@ -104,7 +120,7 @@ however this could be overloaded in settings.
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/var/{log,spool/{ana,}cron},%{_mandir}} \
-	$RPM_BUILD_ROOT/etc/{rc.d/init.d,logrotate.d,sysconfig} \
+	$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}
 
 %{__make} install \
@@ -117,6 +133,7 @@ cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/cron
 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
 
 touch $RPM_BUILD_ROOT/var/log/cron
 
@@ -139,10 +156,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 if [ ! -f /var/log/cron ]; then
-	umask 027
-	touch /var/log/cron
-	chgrp crontab /var/log/cron
-	chmod 660 /var/log/cron
+	install -m 660 -g crontab /dev/null /var/log/cron
 fi
 /sbin/chkconfig --add crond
 %service crond restart "Cron Daemon"
@@ -169,6 +183,12 @@ chmod 754 /etc/rc.d/init.d/crond
 /sbin/chkconfig --del crond
 /sbin/chkconfig --add crond
 
+%post upstart
+%upstart_post crond
+
+%postun upstart
+%upstart_postun crond
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README
@@ -199,3 +219,9 @@ chmod 754 /etc/rc.d/init.d/crond
 %{_mandir}/man8/anacron.8*
 
 %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