rpms/zope/devel .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 zope.init.in, 1.3, 1.4 zope.spec, 1.18, 1.19

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/extras/rpms/zope/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17480

Modified Files:
	.cvsignore sources zope.init.in zope.spec 
Log Message:
- version 2.8.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	22 Oct 2005 12:23:43 -0000	1.10
+++ .cvsignore	21 Feb 2006 19:42:25 -0000	1.11
@@ -1 +1 @@
-Zope-2.8.3-final.tgz
+Zope-2.8.5-final.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	22 Oct 2005 12:23:43 -0000	1.10
+++ sources	21 Feb 2006 19:42:25 -0000	1.11
@@ -1 +1 @@
-49fd128fde4f3201d12821782bcfc211  Zope-2.8.3-final.tgz
+ead959e36894c3c31367063bce018cfb  Zope-2.8.5-final.tgz


Index: zope.init.in
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/zope.init.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zope.init.in	11 Sep 2005 16:31:21 -0000	1.3
+++ zope.init.in	21 Feb 2006 19:42:25 -0000	1.4
@@ -15,34 +15,40 @@
 prog="zope"
 
 start() {
-        output=`$zopectl -u $user start`
+        echo -n $"Starting $prog: "
+        output=`$zopectl -u $user start 2>/dev/null`
         # the return status of zopectl is not reliable, we need to parse
         # its output via substring match
         if echo $output | grep -q "started"; then
             # success
-            action $"Starting $prog:  " /bin/true
             touch /var/lock/subsys/$prog
+            success
+            echo
             RETVAL=0
         else
             # failed
-            action $"Starting $prog:  " /bin/false
+            failure
+            echo
             RETVAL=1
         fi
         return $RETVAL
 }
 
 stop() {
-        output=`$zopectl -u $user stop`
+        echo -n $"Stopping $prog: "
+        output=`$zopectl -u $user stop 2>/dev/null`
         # the return status of zopectl is not reliable, we need to parse
         # its output via substring match
         if echo $output | grep -q "stopped"; then
             # success
-            action $"Stopping $prog:  " /bin/true
             rm -f /var/lock/subsys/$prog
+            success
+            echo
             RETVAL=0
         else
             # failed
-            action $"Stopping $prog:  " /bin/false
+            failure
+            echo
             RETVAL=1
         fi
         return $RETVAL
@@ -71,7 +77,7 @@
 	;;
   *)
 	echo $"Usage: $0 {start|stop|status|restart|condrestart}"
-	RETVAL=1
+	RETVAL=2
 esac
 
-exit $REVAL
+exit $RETVAL


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/devel/zope.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- zope.spec	25 Oct 2005 14:01:48 -0000	1.18
+++ zope.spec	21 Feb 2006 19:42:25 -0000	1.19
@@ -12,12 +12,12 @@
 
 Name:    zope
 Summary: Web application server for flexible content management applications
-Version: 2.8.3
-Release: 3%{?dist}
+Version: 2.8.5
+Release: 1%{?dist}
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:     http://www.zope.org/
-Source0: http://zope.org/Products/Zope/2.8.3/Zope-2.8.3-final.tgz
+Source0: http://zope.org/Products/Zope/2.8.5/Zope-2.8.5-final.tgz
 #Source10: http://www.zope.org/Products/Zope/Hotfix-2005-04-05/Hotfix-20050405/Hotfix_20050405.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -188,6 +188,9 @@
 
 
 %changelog
+* Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 2.8.5-1
+- version 2.8.5
+
 * Tue Oct 25 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.3-3
 - rebuild