up to 1.5.1

[packages/cronie.git] / cronie.spec

diff --git a/cronie.spec b/cronie.spec
index 56e7073bc000baa71b6242ed483f2fad7476378e..f90431ea61beaa632c87cf2a7132c496948326ff 100644 (file)
--- a/cronie.spec
+++ b/cronie.spec
@@ -16,14 +16,13 @@
 
 Summary:       Cron daemon for executing programs at set times
 Name:          cronie
-Version:       1.4.12
-Release:       5
+Version:       1.5.1
+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: 199db91e514a4d75e3222d69874b132f
+# Source0-md5: 910e6effcc032998b0a49fbd46322e18
 Source1:       %{name}.init
-Source2:       cron.logrotate
 Source3:       cron.sysconfig
 Source4:       %{name}.crontab
 Source5:       %{name}.pam
@@ -34,6 +33,7 @@ URL:          https://fedorahosted.org/cronie/
 %{?with_audit:BuildRequires:   audit-libs-devel}
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: glibc-devel >= 6:2.21
 %{?with_selinux:BuildRequires: libselinux-devel}
 BuildRequires: pam-devel
 BuildRequires: rpm >= 4.4.9-56
@@ -63,6 +63,9 @@ Obsoletes:    crontabs
 %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
@@ -130,14 +133,11 @@ cp -p %{SOURCE5} crond.pam
 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 contrib/anacrontab $RPM_BUILD_ROOT/etc/cron/anacrontab
-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 crond.pam  $RPM_BUILD_ROOT/etc/pam.d/crond
 cp -a %{SOURCE6} $RPM_BUILD_ROOT%{systemdunitdir}/crond.service
 
-touch $RPM_BUILD_ROOT/var/log/cron
-
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/cron/cron.allow << 'EOF'
 # cron.allow   This file describes the names of the users which are
 #              allowed to use the local cron daemon
@@ -156,9 +156,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
@@ -216,7 +213,6 @@ chmod 754 /etc/rc.d/init.d/crond
 %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}/crontab
@@ -227,7 +223,6 @@ chmod 754 /etc/rc.d/init.d/crond
 %{_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)