X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=cronie.spec;h=c38b16b33bbb58727b1ab214fb1af08253063880;hb=8609ee665efef41119a533ca59c045ad121a7f59;hp=da383f46b4d29d3c4b09d016d44cb4ed2cfa64ae;hpb=38a551b2b9aff14c5f66353bf74b59c8dd540c3f;p=packages%2Fcronie.git

diff --git a/cronie.spec b/cronie.spec
index da383f4..c38b16b 100644
--- a/cronie.spec
+++ b/cronie.spec
@@ -1,9 +1,6 @@
 # TODO
 # - update paths in manuals (create .in files and send upstream)
 # - make /etc/pam.d independant of sysconfdir (configure-able option and send upstream)
-# - https://fedorahosted.org/cronie/changeset/272c4a5c417bfa6e04148fc35a4fe4c6956b17e1
-#   should we follow it too? our pam contains cron.{allow,deny} listfile rules,
-#   cronie itself checks these files so safe to drop?
 #
 # Conditional build:
 %bcond_without	inotify		# without inotify support
@@ -17,12 +14,12 @@
 
 Summary:	Cron daemon for executing programs at set times
 Name:		cronie
-Version:	1.4.2
-Release:	1
+Version:	1.4.3
+Release:	2
 License:	MIT and BSD and GPL v2
 Group:		Daemons
 Source0:	https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz
-# Source0-md5:	9c7cef09ff9c92a90a314a1e947fae5c
+# Source0-md5:	2393b3e5828fc09d9acf04dfd7796ab9
 Source1:	%{name}.init
 Source2:	cron.logrotate
 Source3:	cron.sysconfig
@@ -30,6 +27,7 @@ Source4:	%{name}.crontab
 Source5:	%{name}.pam
 Patch0:		inotify-nosys.patch
 Patch1:		%{name}-nosyscrontab.patch
+Patch2:		sendmail-path.patch
 URL:		https://fedorahosted.org/cronie/
 %{?with_audit:BuildRequires:	audit-libs-devel}
 BuildRequires:	autoconf
@@ -40,14 +38,13 @@ BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post):	fileutils
 Requires(post,preun):	/sbin/chkconfig
-Requires(post,preun):	rc-scripts
 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
+Requires:	rc-scripts >= 0.4.0.19
 %{?with_inotify:Requires:	uname(release) >= 2.6.13}
 Provides:	crondaemon
 Provides:	crontabs = 1.7
@@ -83,6 +80,7 @@ however this could be overloaded in settings.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__aclocal}
@@ -158,18 +156,15 @@ if [ "$1" = "0" ]; then
 	%groupremove crontab
 fi
 
-%triggerpostun -- hc-cron
-# reinstall crond init.d links, which could be different
-/sbin/chkconfig --del crond
-/sbin/chkconfig --add crond
-
-%triggerun -- vixie-cron
+%triggerun -- hc-cron,fcron,vixie-cron
 # Prevent preun from crond from working
 chmod a-x /etc/rc.d/init.d/crond
 
-%triggerpostun -- vixie-cron
+%triggerpostun -- hc-cron,fcron,vixie-cron
 # Restore what triggerun removed
 chmod 754 /etc/rc.d/init.d/crond
+# reinstall crond init.d links, which could be different
+/sbin/chkconfig --del crond
 /sbin/chkconfig --add crond
 
 %files