rpms/vixie-cron/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 vixie-cron.spec, 1.106, 1.107

Marcela Mašláňová (mmaslano) fedora-extras-commits at redhat.com
Tue Oct 30 09:20:43 UTC 2007


Author: mmaslano

Update of /cvs/pkgs/rpms/vixie-cron/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5287

Modified Files:
	.cvsignore sources vixie-cron.spec 
Log Message:
Version 4.3.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vixie-cron/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Aug 2007 13:21:36 -0000	1.4
+++ .cvsignore	30 Oct 2007 09:20:10 -0000	1.5
@@ -1 +1 @@
-vixie-cron-4.2.tar.gz
+vixie-cron-4.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vixie-cron/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Aug 2007 13:21:36 -0000	1.4
+++ sources	30 Oct 2007 09:20:10 -0000	1.5
@@ -1 +1 @@
-e84f03cbb0f4efb8bbb5712cb4300bf4  vixie-cron-4.2.tar.gz
+9a67d434a27b44482affb0c2146078f3  vixie-cron-4.3.tar.gz


Index: vixie-cron.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vixie-cron/devel/vixie-cron.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- vixie-cron.spec	24 Sep 2007 13:38:58 -0000	1.106
+++ vixie-cron.spec	30 Oct 2007 09:20:10 -0000	1.107
@@ -1,35 +1,30 @@
-%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
-%define WITH_SELINUX 1
-%endif
-%if %{?WITH_PAM:0}%{!?WITH_PAM:1}
-%define WITH_PAM 1
-%endif
-%if %{?WITH_AUDIT:0}%{!?WITH_AUDIT:1}
-%define WITH_AUDIT 1
-%endif
+%bcond_without selinux
+%bcond_without pam
+%bcond_without audit
 Summary: The Vixie cron daemon for executing specified programs at set times
 Name: vixie-cron
-Version: 4.2
-Release: 3%{?dist}
+Version: 4.3
+Release: 1%{?dist}
 Epoch: 4
-License: BSD
+License: MIT and BSD
 Group: System Environment/Base
+URL: https://hosted.fedoraproject.org/projects/vixie-cron/
 Source0: https://hosted.fedoraproject.org/projects/vixie-cron/wiki/%{name}-%{version}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 Requires: syslog, bash >= 2.0
 Buildrequires: automake, autoconf
 Conflicts: sysklogd < 1.4.1
-%if %{WITH_SELINUX}
+
+%if %{with_selinux}
 Requires: libselinux >= 2.0.0
 Buildrequires: libselinux-devel >= 2.0.0
 %endif
-%if %{WITH_PAM}
+%if %{with_pam}
 Requires: pam >= 0.99.6.2
 Buildrequires: pam-devel >= 0.99.6.2
 %endif
-%if %{WITH_AUDIT}
-Requires: audit-libs >= 1.4.1
-Buildrequires: audit-libs >= 1.4.1
+%if %{with_audit}
 Buildrequires: audit-libs-devel >= 1.4.1
 %endif
 
@@ -55,22 +50,21 @@
 autoconf
 
 %build
-%configure \
-%if %{WITH_PAM}
---with-pam
-%endif
+CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
+LDFLAGS="$LDFLAGS -fpie"; export LDFLAGS
 
-make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DLINT -Dlint" \
-%if %{WITH_SELINUX}
-WITH_SELINUX=1 \
+%configure \
+%if %{with_pam}
+--with-pam \
 %endif
-%if %{WITH_PAM}
-WITH_PAM=1 \
+%if %{with_selinux}
+--with-selinux \
 %endif
-%if %{WITH_AUDIT}
-WITH_AUDIT=1 \
+%if %{with_audit}
+--with-audit
 %endif
-;
+
+make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DLINT -Dlint"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -86,8 +80,8 @@
 mv ./vixie-cron.init $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/crond
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/
 mv ./crond.sysconfig $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/crond
-%if ! %{WITH_PAM}
-	rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d
+%if ! %{with_pam}
+    rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d
 %endif
 touch $RPM_BUILD_ROOT/%{_sysconfdir}/cron.deny
 
@@ -96,7 +90,6 @@
 
 %post
 /sbin/chkconfig --add crond
-#[ ! -f /etc/cron.allow ] && [ ! -f /etc/cron.deny ] && touch /etc/cron.deny ||:;
  
 %preun
 if [ $1 = 0 ]; then
@@ -121,17 +114,20 @@
 %{_mandir}/man8/cron.*
 %{_mandir}/man5/crontab.*
 %{_mandir}/man1/crontab.*
-%attr(700,root,root) %dir %{_localstatedir}/spool/cron
-%attr(700,root,root) %dir %{_sysconfdir}/cron.d
+%attr(755,root,root) %dir %{_localstatedir}/spool/cron
+%attr(755,root,root) %dir %{_sysconfdir}/cron.d
 %attr(755,root,root) %{_sysconfdir}/rc.d/init.d/crond
-%if %{WITH_PAM}   
-	%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/crond
+%if %{with_pam}
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/crond
 %endif
 %config(noreplace) %{_sysconfdir}/sysconfig/crond
 %config(noreplace) %{_sysconfdir}/cron.deny
-%doc %{_datadir}/doc/cron/*
 
 %changelog
+* Mon Oct 29 2007 Marcela Maslanova <mmaslano at redhat.com> - 4:4.3-1
+- 247228: cron jobs fail semi-randomly if sendmail incapacitated
+- 226529: Merge Review: vixie-cron (use bcond macros)
+
 * Mon Sep 24 2007 Marcela Maslanova <mmaslano at redhat.com> - 4:4.2-3
 - cron own cron.deny
 - correct license tag




More information about the scm-commits mailing list