rpms/tomcat5/devel tomcat5-5.5.conf, 1.4, 1.5 tomcat5-5.5.init, 1.5, 1.6 tomcat5.spec, 1.102, 1.103

[Devrim GÜNDÜZ (devrim)]

Author: devrim

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

Modified Files:
	tomcat5-5.5.conf tomcat5-5.5.init tomcat5.spec 
Log Message:
- Fix init script for bz #380921
- Fix tomcat5.conf and spec file for bz #253605




Index: tomcat5-5.5.conf
===================================================================
RCS file: /cvs/extras/rpms/tomcat5/devel/tomcat5-5.5.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tomcat5-5.5.conf	19 Feb 2007 18:52:28 -0000	1.4
+++ tomcat5-5.5.conf	16 Nov 2007 20:44:14 -0000	1.5
@@ -18,7 +18,7 @@
 #JAVA_OPTS="-Xminf0.1 -Xmaxf0.3"
 
 # Use JAVA_OPTS to set java.library.path for libtcnative.so
-#JAVA_OPTS="-Djava.library.path=/usr/lib
+#JAVA_OPTS="-Djava.library.path=@@@LIBDIR@@@
 
 # Bug 190:
 # https://www.jpackage.org/bugzilla/show_bug.cgi?id=190 


Index: tomcat5-5.5.init
===================================================================
RCS file: /cvs/extras/rpms/tomcat5/devel/tomcat5-5.5.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tomcat5-5.5.init	16 May 2007 10:57:12 -0000	1.5
+++ tomcat5-5.5.init	16 Nov 2007 20:44:14 -0000	1.6
@@ -18,11 +18,10 @@
 # - heavily rewritten by Deepak Bhole and Jason Corley
 #
 
-# commented out until the RHEL and FC daemon functions converge
 # Source the function library
-#if [ -r "/etc/rc.d/init.d/functions" ]; then
-    #. /etc/rc.d/init.d/functions
-#fi
+if [ -r "/etc/rc.d/init.d/functions" ]; then
+    . /etc/rc.d/init.d/functions
+fi
 
 NAME="$(basename $0)"
 unset ISBOOT
@@ -69,40 +68,6 @@
 
 RETVAL="0"
 
-# remove when the RHEL and FC daemon functions converge
-# (pulled from /etc/rc.d/init.d/functions)
-function checkpid() {
-    local i
-    for i in $* ; do
-        if [ -d "/proc/${i}" ]; then
-            return 0
-        fi
-    done
-    return 1
-}
-
-# remove when the RHEL and FC daemon functions converge
-# (pulled from /etc/rc.d/init.d/functions)
-function echo_failure() {
-    echo -en "\\033[60G"
-    echo -n "[  "
-    echo -n $"FAILED"
-    echo -n "  ]"
-    echo -ne "\r"
-    return 1
-}
-
-# remove when the RHEL and FC daemon functions converge
-# (pulled from /etc/rc.d/init.d/functions)
-function echo_success() {
-    echo -en "\\033[60G"
-    echo -n "[  "
-    echo -n $"OK"
-    echo -n "  ]"
-    echo -ne "\r"
-    return 0
-}
-
 # Look for open ports, as the function name might imply
 function findFreePorts() {
     local isSet1="false"


Index: tomcat5.spec
===================================================================
RCS file: /cvs/extras/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- tomcat5.spec	16 Nov 2007 02:57:27 -0000	1.102
+++ tomcat5.spec	16 Nov 2007 20:44:14 -0000	1.103
@@ -69,7 +69,7 @@
 Name: tomcat5
 Epoch: 0
 Version: 5.5.25
-Release: 1jpp.1%{?dist}
+Release: 1jpp.2%{?dist}
 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 
 Group: Networking/Daemons
@@ -711,7 +711,8 @@
         -e "s|\@\@\@TCSERVER\@\@\@|%{serverdir}|g" \
         -e "s|\@\@\@TCSHARED\@\@\@|%{shareddir}|g" \
         -e "s|\@\@\@TCAPP\@\@\@|%{appdir}|g" \
-        -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" $i
+	-e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" \
+	-e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" $i
 done
 # Process server/lib
 # Remove local JARs (to be replaced with jpp links in post)
@@ -1299,6 +1300,10 @@
 %endif
 
 %changelog
+* Fri Nov 16 2007 Devrim GUNDUZ <devrim at commandprompt.com> 0:5.5.25-1jpp.2
+- Fix init script for bz #380921
+- Fix tomcat5.conf and spec file for bz #253605
+
 * 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:
   * CVE-2007-1355