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

[fedora-cvs-commits at redhat.com]

Author: mmaslano

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

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.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- vixie-cron.spec	28 Feb 2007 12:56:25 -0000	1.90
+++ vixie-cron.spec	5 Mar 2007 10:34:34 -0000	1.91
@@ -10,7 +10,7 @@
 Summary: The Vixie cron daemon for executing specified programs at set times
 Name: vixie-cron
 Version: 4.1
-Release: 75%{?dist}
+Release: 76%{?dist}
 Epoch: 4
 License: BSD
 Group: System Environment/Base
@@ -101,7 +101,9 @@
 Buildrequires: audit-libs-devel >= 1.4.1
 %endif
 
-Requires: /sbin/chkconfig /etc/init.d /sbin/service
+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
 
 %description
 The vixie-cron package contains the Vixie version of cron.  Cron is a
@@ -201,18 +203,21 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/usr/{bin,sbin}
+#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/etc/rc.d/init.d
-mkdir -p $RPM_BUILD_ROOT/etc/pam.d
-make install DESTDIR=$RPM_BUILD_ROOT DESTMAN=$RPM_BUILD_ROOT%{_mandir}
-mkdir -p $RPM_BUILD_ROOT/var/spool/cron
-chmod 700 $RPM_BUILD_ROOT/var/spool/cron
-mkdir -p $RPM_BUILD_ROOT/etc/cron.d
-chmod 755 $RPM_BUILD_ROOT/etc/cron.d
-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/crond
+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 -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/
-cp %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/crond
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/crond
 %if ! %{WITH_PAM}
 	rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
 %endif
@@ -249,13 +254,16 @@
 %{_mandir}/man1/crontab.*
 %attr(700,root,root) %dir /var/spool/cron
 %attr(700,root,root) %dir /etc/cron.d
-%attr(755,daemon,daemon) /etc/rc.d/init.d/crond
+%attr(755,root,root) /etc/rc.d/init.d/crond
 %if %{WITH_PAM}   
 	%config(noreplace) /etc/pam.d/crond
 %endif
 %config(noreplace) /etc/sysconfig/crond
 
 %changelog
+* Mon Mar 05 2007 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-76
+- rhbz#226529 merge review
+
 * Wed Feb 28 2007 Marcela Maslanova <mmaslano at redhat.com> - 4:4.1-75
 - rhbz#226529 merge review