rpms/vixie-cron/devel vixie-cron.spec,1.91,1.92

[fedora-cvs-commits at redhat.com]

Author: mmaslano

Update of /cvs/dist/rpms/vixie-cron/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30503

Modified Files:
	vixie-cron.spec 
Log Message:
Change in spec for review.



Index: vixie-cron.spec
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- vixie-cron.spec	5 Mar 2007 10:34:34 -0000	1.91
+++ vixie-cron.spec	7 Mar 2007 16:08:00 -0000	1.92
@@ -10,7 +10,7 @@
 Summary: The Vixie cron daemon for executing specified programs at set times
 Name: vixie-cron
 Version: 4.1
-Release: 76%{?dist}
+Release: 77%{?dist}
 Epoch: 4
 License: BSD
 Group: System Environment/Base
@@ -101,9 +101,11 @@
 Buildrequires: audit-libs-devel >= 1.4.1
 %endif
 
-Requires(post): /sbin/chkconfig /etc/init.d /sbin/service
-Requires(postun): /sbin/chkconfig /etc/init.d /sbin/service
-Requires(preun): /sbin/chkconfig /etc/init.d /sbin/service
+Requires(post): /sbin/chkconfig coreutils
+Requires(postun): /sbin/chkconfig
+Requires(postun): /sbin/service 
+Requires(preun): /sbin/chkconfig 
+Requires(preun): /sbin/service
 
 %description
 The vixie-cron package contains the Vixie version of cron.  Cron is a
@@ -140,7 +142,7 @@
 %patch18 -p1 -b .cron_log_facility
 %patch19 -p1 -b .crontab_stat_not_fstat
 %patch20 -p1 -b .nickname_man
-%patch21 -p1 -b -i_option
+%patch21 -p1 -b .-i_option
 %patch22 -p1 -b .no_0600_mode_enforce
 #%if %{WITH_SELINUX}
 %patch23 -p1 -b .freecon_segv
@@ -189,6 +191,7 @@
 %patch65 -p1 -b ._63newavc
 
 %build
+# RPM_OPT_FLAGS are better here, because we don't have configure for set up variables ;-)
 make %{?_smp_mflags} RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g -DLINT -Dlint" \
 %if %{WITH_SELINUX}
 WITH_SELINUX=1 \
@@ -203,19 +206,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-#mkdir -p $RPM_BUILD_ROOT/usr/{bin,sbin}
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
 mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{1,5,8}
+mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{1,5,8}
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d
 make install -p DESTDIR=$RPM_BUILD_ROOT DESTMAN=$RPM_BUILD_ROOT%{_mandir}
-mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/spool/cron
-chmod 700 $RPM_BUILD_ROOT/%{_localstatedir}/spool/cron
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d
-chmod 755 $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d
-install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/crond
-chmod 755 $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/crond
+mkdir -pm700 $RPM_BUILD_ROOT/%{_localstatedir}/spool/cron
+mkdir -pm755 $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d
+install -pm755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/crond
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/crond
 %if ! %{WITH_PAM}
@@ -230,9 +229,9 @@
 [ ! -f /etc/cron.allow ] && [ ! -f /etc/cron.deny ] && touch /etc/cron.deny ||:;
  
 %preun
-if [ "$1" = 0 ]; then
-	[ -f /var/lock/subsys/crond ] && /sbin/service crond stop >/dev/null 2>&1
-	/sbin/chkconfig --del crond
+if [ $1 = 0 ]; then
+	/sbin/service crond stop >/dev/null 2>&1 || :
+	/sbin/chkconfig --del <script>
 fi
 
 %postun
@@ -246,8 +245,8 @@
 
 %files
 %defattr(-,root,root,-)
-/usr/sbin/crond
-%attr(6755,root,root) /usr/bin/crontab
+%{_sbindir}/crond
+%attr(6755,root,root) %{_bindir}/crontab
 %{_mandir}/man8/crond.*
 %{_mandir}/man8/cron.*
 %{_mandir}/man5/crontab.*
@@ -261,6 +260,9 @@
 %config(noreplace) /etc/sysconfig/crond
 
 %changelog
+* Thu Mar 07 2007 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-77
+- merge review
+
 * Mon Mar 05 2007 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-76
 - rhbz#226529 merge review