X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcronie.git;a=blobdiff_plain;f=cronie.spec;h=b081affda7003adca514c8524ae32e8dd0146b8a;hp=c6afba93f06b421ece8bf2f282d310571d530eab;hb=1c89d0c;hpb=6f54bc3d6ff8b9b7bb50be856b9e3f83e0a0e227

diff --git a/cronie.spec b/cronie.spec
index c6afba9..b081aff 100644
--- a/cronie.spec
+++ b/cronie.spec
@@ -15,26 +15,26 @@
 %endif
 
 Summary:	Cron daemon for executing programs at set times
+Summary(pl.UTF-8):	Demon cron do uruchamiania programów o zadanym czasie
 Name:		cronie
-Version:	1.4.9
+Version:	1.5.2
 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:	9133195e5e6f824ef460f5ccc533f1b7
+Source0:	https://github.com/cronie-crond/cronie/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	703314f58a49ea136e9966d3937d9bf4
 Source1:	%{name}.init
-Source2:	cron.logrotate
 Source3:	cron.sysconfig
 Source4:	%{name}.crontab
 Source5:	%{name}.pam
-Source6:	%{name}.upstart
-Source7:	crond.service
+Source6:	crond.service
 Patch0:		inotify-nosys.patch
 Patch1:		sendmail-path.patch
-URL:		https://fedorahosted.org/cronie/
+URL:		https://github.com/cronie-crond/cronie/
 %{?with_audit:BuildRequires:	audit-libs-devel}
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
+BuildRequires:	glibc-devel >= 6:2.21
 %{?with_selinux:BuildRequires:	libselinux-devel}
 BuildRequires:	pam-devel
 BuildRequires:	rpm >= 4.4.9-56
@@ -54,6 +54,7 @@ Requires:	systemd-units >= 38}
 %{?with_inotify:Requires:	uname(release) >= 2.6.13}
 Provides:	crondaemon
 Provides:	crontabs = 1.7
+Provides:	cronjobs
 Provides:	group(crontab)
 %if "%{pld_release}" == "th"
 Provides:	vixie-cron = 4.3-1
@@ -61,19 +62,31 @@ Provides:	vixie-cron = 4.3-1
 Obsoletes:	crondaemon
 Obsoletes:	cronie-systemd
 Obsoletes:	crontabs
+Obsoletes:	cronjobs
 %if "%{pld_release}" == "th"
 Obsoletes:	vixie-cron < 4.3-1
 %endif
+Conflicts:	sysklogd < 1.5.1-2
+Conflicts:	syslog-ng < 3.6.4-3
+Conflicts:	rsyslog < 5.10.1-4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Cronie contains the standard UNIX daemon crond that runs specified
 programs at scheduled times and related tools. It is based on the
 original cron and has security and configuration enhancements like the
-ability to use pam and SELinux.
+ability to use PAM and SELinux.
+
+%description -l pl.UTF-8
+Cronie zawiera standardowego demona uniksowego crond, uruchamiającego
+podane programy o zadanym czasie, oraz powiązane narzędzia. Jest
+oparty na oryginalnym cronie i zawiera rozszerzenia bezpieczeństwa i
+konfiguracji, takie jak możliwość wykorzystania mechanizmów PAM i
+SELinux.
 
 %package anacron
 Summary:	Utility for running regular jobs
+Summary(pl.UTF-8):	Narzędzie do uruchamiania regularnych zadań
 Group:		Base
 Provides:	anacron = 2.4
 Obsoletes:	anacron <= 2.3
@@ -83,18 +96,10 @@ 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.
+%description anacron -l pl.UTF-8
+Anacron stał się częścią cronie. Służy tylko do uruchamiania
+regularnych zadań. Domyślne ustawienia wykonują zadania przy użyciu
+anacrona, ale może to być zmienione w ustawieniach.
 
 %prep
 %setup -q
@@ -110,39 +115,44 @@ Opis zadania Upstart dla Cronie.
 	SYSCRONTAB=/etc/crontab \
 	SYS_CROND_DIR=/etc/cron.d \
 	--sysconfdir=/etc/cron \
+	--with-editor=/bin/vi \
+	--with-audit%{!?with_audit:=no} \
+	--with-inotify%{!?with_inotify:=no} \
 	--with-pam \
-	--with%{!?with_selinux:out}-selinux \
-	--with%{!?with_audit:out}-audit \
-	--with%{!?with_inotify:out}-inotify \
-	--without-syscrontab \
+	--with-selinux%{!?with_selinux:=no} \
+	--disable-syscrontab \
+	--enable-anacron \
 %if "%{cc_version}" >= "3.4"
 	--enable-pie \
 %endif
-	--enable-relro \
-	--enable-anacron
+	--enable-relro
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/var/{log,spool/{ana,}cron},%{_mandir},%{systemdunitdir}}\
-	$RPM_BUILD_ROOT/etc/{rc.d/init.d,logrotate.d,sysconfig,init} \
+	$RPM_BUILD_ROOT/etc/{rc.d/init.d,logrotate.d,sysconfig} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/{cron,cron.{d,hourly,daily,weekly,monthly},pam.d}
 
 %{__make} install \
 	pamdir=/etc/pam.d \
 	DESTDIR=$RPM_BUILD_ROOT
 
+cp -p %{SOURCE5} crond.pam
+
+%if %{without audit}
+# remove recording user's login uid to the process attribute
+%{__sed} -i -e '/pam_loginuid.so/d' crond.pam
+%endif
+
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/crond
 cp -a contrib/0anacron $RPM_BUILD_ROOT/etc/cron.hourly/0anacron
-cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/cron
+cp -a contrib/anacrontab $RPM_BUILD_ROOT/etc/cron/anacrontab
 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}/crond.service
-
-touch $RPM_BUILD_ROOT/var/log/cron
+cp -a crond.pam  $RPM_BUILD_ROOT/etc/pam.d/crond
+cp -a %{SOURCE6} $RPM_BUILD_ROOT%{systemdunitdir}/crond.service
 
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/cron/cron.allow << 'EOF'
 # cron.allow	This file describes the names of the users which are
@@ -162,9 +172,6 @@ rm -rf $RPM_BUILD_ROOT
 %groupadd -g 117 -r -f crontab
 
 %post
-if [ ! -f /var/log/cron ]; then
-	install -m 660 -g crontab /dev/null /var/log/cron
-fi
 /sbin/chkconfig --add crond
 %service crond restart "Cron Daemon"
 %systemd_post crond.service
@@ -208,46 +215,39 @@ 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
-%attr(750,root,crontab) %dir %{_sysconfdir}/cron*
+%attr(750,root,crontab) %dir /etc/cron
+%attr(750,root,crontab) %dir /etc/cron.daily
+%attr(750,root,crontab) %dir /etc/cron.hourly
+%attr(750,root,crontab) %dir /etc/cron.monthly
+%attr(750,root,crontab) %dir /etc/cron.weekly
 %attr(640,root,crontab) %config(noreplace,missingok) /etc/cron.d/crontab
 %attr(640,root,crontab) %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/cron/cron.allow
 %attr(640,root,crontab) %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/cron/cron.deny
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/cron
 %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/crond
 %attr(754,root,root) /etc/rc.d/init.d/crond
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/cron
 %{systemdunitdir}/crond.service
 %attr(755,root,root) %{_sbindir}/crond
+%attr(2755,root,crontab) %{_bindir}/cronnext
 %attr(2755,root,crontab) %{_bindir}/crontab
 
 %{_mandir}/man8/crond.8*
 %{_mandir}/man8/cron.8*
 %{_mandir}/man5/crontab.5*
+%{_mandir}/man1/cronnext.1*
 %{_mandir}/man1/crontab.1*
 
 %attr(1730,root,crontab) /var/spool/cron
-%attr(660,root,crontab) %ghost /var/log/cron
 
 %files anacron
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/anacron
 %attr(755,root,root) %{_sysconfdir}/cron.hourly/0anacron
+%attr(640,root,crontab) %config(noreplace,missingok) %verify(not md5 mtime size) /etc/cron/anacrontab
 %{_mandir}/man5/anacrontab.5*
 %{_mandir}/man8/anacron.8*
 
 %attr(1730,root,crontab) /var/spool/anacron
-
-%if "%{pld_release}" == "th"
-%files upstart
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) /etc/init/crond.conf
-%endif