rpms/tomcat5/F-8 tomcat5-5.5.init,1.6,1.7 tomcat5.spec,1.103,1.104

[Devrim GÜNDÜZ (devrim)]

Author: devrim

Update of /cvs/extras/rpms/tomcat5/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19702/F-8

Modified Files:
	tomcat5-5.5.init tomcat5.spec 
Log Message:
- Fix init script, per bz #247077
- Fix builds on alpha, per bz #253827.




Index: tomcat5-5.5.init
===================================================================
RCS file: /cvs/extras/rpms/tomcat5/F-8/tomcat5-5.5.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tomcat5-5.5.init	5 Jan 2008 12:28:54 -0000	1.6
+++ tomcat5-5.5.init	5 Jan 2008 13:52:58 -0000	1.7
@@ -153,7 +153,7 @@
             read kpid < /var/run/${NAME}.pid
                 if checkpid $kpid 2>&1; then
                     echo "$NAME process already running"
-                        return -1
+			echo_success
                     else
                         echo "lock file found but no process running for"
                         echo "pid $kpid, continuing"
@@ -193,6 +193,7 @@
         if checkpid $kpid 2>&1; then
             echo "$0 is already running (${kpid})"
             RETVAL="0"
+	    echo_success
         else
             echo "lock file found but no process running for pid $kpid"
         fi
@@ -211,6 +212,15 @@
 function stop() {
     local STOP_VERBOSE="false"
     echo -n "Stopping $TOMCAT_PROG: "
+    if [ ! -f /var/run/${NAME}.pid ]; then
+	echo "$NAME process already stopped"
+	echo_success
+    fi
+     read kpid < /var/run/${NAME}.pid
+                if checkpid $kpid 2>&1; then
+                    echo "$NAME process already stopped"
+                        echo_success
+		elif
     if [ -f "/var/lock/subsys/${NAME}" ]; then
         $SU - $TOMCAT_USER -c "$TOMCAT_SCRIPT stop" >> $TOMCAT_LOG 2>&1
         RETVAL="$?"


Index: tomcat5.spec
===================================================================
RCS file: /cvs/extras/rpms/tomcat5/F-8/tomcat5.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- tomcat5.spec	5 Jan 2008 12:28:54 -0000	1.103
+++ tomcat5.spec	5 Jan 2008 13:52:58 -0000	1.104
@@ -98,7 +98,7 @@
 Patch13: %{name}-%{majversion}-http11-build.patch
 Patch14: %{name}-%{majversion}-jk-build.patch
 Patch16: %{name}-%{majversion}-jspc-classpath.patch
-#FIXME Disable JSP pre-compilation on ppc64 and x390x
+#FIXME Disable JSP pre-compilation on ppc64, x390x and alpha
 Patch18: %{name}-%{majversion}-skip-jsp-precompile.patch
 # XXX:
 # Seems to be only needed when building with ECJ for java 1.5 since
@@ -447,7 +447,7 @@
 %patch13 -b .p13
 %patch14 -b .p14
 %patch16 -b .p16
-%ifarch ppc64 s390x
+%ifarch ppc64 s390x alpha
 %patch18 -b .p18
 %endif
 %patch19 -b .p19
@@ -620,7 +620,8 @@
 touch ${RPM_BUILD_ROOT}%{logdir}/catalina.out
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}{%{serverdir},%{tempdir},%{workdir}}
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}{%{appdir},%{commondir},%{shareddir}}
-%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/{rc.d/init.d,logrotate.d}
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_initrddir}
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_bindir}
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_javadir}/%{name}
 %{__install} -m 755 %{SOURCE5} ${RPM_BUILD_ROOT}%{bindir}/relink
@@ -648,7 +649,7 @@
 %{__install} -m 0644 %{name} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name}
 %{__rm} %{name}
 %{__install} %{SOURCE1} \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/%{name}
+    ${RPM_BUILD_ROOT}%{_initrddir}/%{name}
 # Global configuration file
 %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{confdir}
 %{__cat} > %{name}.conf << EOT
@@ -700,7 +701,7 @@
     ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name} \
     ${RPM_BUILD_ROOT}%{_bindir}/d%{name} \
     ${RPM_BUILD_ROOT}%{_bindir}/%{name} \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/%{name} \
+    ${RPM_BUILD_ROOT}%{_initrddir}/%{name} \
     ${RPM_BUILD_ROOT}%{bindir}/relink \
     ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}; do
     %{__sed} -i -e 's|\@\@\@TCCONF\@\@\@|%{confdir}|g' \
@@ -1070,8 +1071,8 @@
 # Always clean up workdir and tempdir on upgrade/removal
 %{__rm} -fr %{workdir}/* %{tempdir}/*
 if [ $1 = 0 ]; then
-    [ -f /var/lock/subsys/%{name} ] && %{_sysconfdir}/rc.d/init.d/%{name} stop
-    [ -f %{_sysconfdir}/rc.d/init.d/%{name} ] && /sbin/chkconfig --del %{name}
+    [ -f /var/lock/subsys/%{name} ] && %{_initrddir}/%{name} stop
+    [ -f %{_initrddir}/%{name} ] && /sbin/chkconfig --del %{name}
     # Remove automated symlinks
     for repository in %{commondir}/endorsed; do
         find $repository -name '\[*\]*.jar' -not -type d | xargs %{__rm} -f
@@ -1148,7 +1149,7 @@
 %attr(755,root,root) %{bindir}/relink
 %attr(644,root,root) %{bindir}/*.jar
 %attr(644,root,root) %{bindir}/*.xml
-%attr(755,root,root) %{_sysconfdir}/rc.d/init.d/%{name}
+%attr(755,root,root) %{_initrddir}/%{name}
 %attr(644,root,tomcat) %config(noreplace) %{confdir}/catalina.policy
 %attr(644,root,tomcat) %config(noreplace) %{confdir}/catalina.properties
 %attr(660,root,tomcat) %config(noreplace) %{confdir}/logging.properties
@@ -1222,7 +1223,7 @@
 %dir %{appdir}/webdav
 %{appdir}/webdav/*
 %if %{gcj_support}
-%ifnarch ppc64 s390x
+%ifnarch ppc64 s390x alpha
 %attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-root*
 %endif
 %endif
@@ -1305,6 +1306,8 @@
 - Fix tomcat5.conf and spec file for bz #253605
 - Fix for bz #426850
 - Fix for bz #312561
+- Fix init script, per bz #247077
+- Fix builds on alpha, per bz #253827
 
 * Thu Nov 15 2007 Devrim GUNDUZ <devrim at commandprompt.com> 0:5.5.25-1jpp.1
 - Updated to 5.5.25, to fix the following issues: