rpms/cronie/devel cronie.spec,1.7,1.8

[Marcela Mašláňová (mmaslano)]

Author: mmaslano

Update of /cvs/pkgs/rpms/cronie/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30650

Modified Files:
	cronie.spec 
Log Message:
Another upgrade bug.



Index: cronie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cronie/devel/cronie.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cronie.spec	2 Jun 2008 08:01:27 -0000	1.7
+++ cronie.spec	4 Jun 2008 08:05:28 -0000	1.8
@@ -6,7 +6,7 @@
 Summary: Cron daemon for executing programs at set times
 Name: cronie
 Version: 1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT and BSD
 Group: System Environment/Base
 URL: https://fedorahosted.org/cronie
@@ -82,7 +82,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-    /sbin/chkconfig --add crond
+/sbin/chkconfig --add crond
 
 %preun
 if [ "$1" = "0" ]; then
@@ -98,15 +98,12 @@
 #copy the lock, remove old daemon from chkconfig
 %triggerun -- vixie-cron
 cp -a /var/lock/subsys/crond /var/lock/subsys/cronie > /dev/null 2>&1 ||:
-/sbin/chkconfig --del crond
 
 #if the lock exist, then we restart daemon (it was running in the past).
-#add new daemon into chkconfig everytime, when we upgrade cronie
+#add new daemon into chkconfig everytime, when we upgrade to cronie from vixie-cron
 %triggerpostun -- vixie-cron
-/sbin/chkconfig --add crond;
-# it's useless because afer upgrade from cd are daemons dead
-#[ -f /var/lock/subsys/cronie ] && ( rm -f /var/lock/subsys/cronie ;
-service crond restart ) > /dev/null 2>&1 ||:
+/sbin/chkconfig --add crond
+[ -f /var/lock/subsys/cronie ] && ( rm -f /var/lock/subsys/cronie ; service crond restart ) > /dev/null 2>&1 ||:
 
 %files
 %defattr(-,root,root,-)
@@ -127,6 +124,9 @@
 %config(noreplace) %{_sysconfdir}/cron.deny
 
 %changelog
+* Wed Jun  4 2008 Marcela Maslanova <mmaslano at redhat.com> - 1.1-2
+- 49864 upgrade/update problem. Syntax error in spec.
+
 * Wed May 28 2008 Marcela Maslanova <mmaslano at redhat.com> - 1.1-1
 - release 1.1