rpms/tomcat5/devel tomcat5-5.5-catalina.sh.patch, 1.3, 1.4 tomcat5-5.5.init, 1.6, 1.7 tomcat5.spec, 1.104, 1.105

[Devrim GÜNDÜZ (devrim)]

Author: devrim

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

Modified Files:
	tomcat5-5.5-catalina.sh.patch tomcat5-5.5.init tomcat5.spec 
Log Message:
First cut of Tomcat5 bug closing day:

- Fix for bz #153187
- Fix init script for bz #380921
- Fix tomcat5.conf and spec file for bz #253605
- Fix for bz #426850
- Fix for bz #312561



tomcat5-5.5-catalina.sh.patch:

Index: tomcat5-5.5-catalina.sh.patch
===================================================================
RCS file: /cvs/extras/rpms/tomcat5/devel/tomcat5-5.5-catalina.sh.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tomcat5-5.5-catalina.sh.patch	4 Oct 2006 20:19:04 -0000	1.3
+++ tomcat5-5.5-catalina.sh.patch	5 Jan 2008 12:28:57 -0000	1.4
@@ -42,7 +42,7 @@
 +if [ -z "$JAVA_HOME" ]; then
 +    # Search for java in PATH
 +    JAVA=`which java`
-+    if [ -z "$JAVA" ] ; then
++    if [ -n "$JAVA" ] ; then
 +        JAVA_BINDIR=`dirname ${JAVA}`
 +        JAVA_HOME="${JAVA_BINDIR}/.."
 +    fi


Index: tomcat5-5.5.init
===================================================================
RCS file: /cvs/extras/rpms/tomcat5/devel/tomcat5-5.5.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tomcat5-5.5.init	16 Nov 2007 20:44:14 -0000	1.6
+++ tomcat5-5.5.init	5 Jan 2008 12:28:57 -0000	1.7
@@ -63,8 +63,14 @@
 # Define the tomcat username
 TOMCAT_USER="${TOMCAT_USER:-tomcat}"
 
+# Define the tomcat group
+TOMCAT_GROUP="${TOMCAT_GROUP:-tomcat}"
+
 # Define the tomcat log file
 TOMCAT_LOG="${TOMCAT_LOG:-/var/log/tomcat5/catalina.out}"
+ 
+test -e $TOMCAT_LOG || touch $TOMCAT_LOG
+chown $TOMCAT_USER:$TOMCAT_GROUP $TOMCAT_LOG
 
 RETVAL="0"
 


Index: tomcat5.spec
===================================================================
RCS file: /cvs/extras/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- tomcat5.spec	17 Nov 2007 00:35:30 -0000	1.104
+++ tomcat5.spec	5 Jan 2008 12:28:57 -0000	1.105
@@ -69,7 +69,7 @@
 Name: tomcat5
 Epoch: 0
 Version: 5.5.25
-Release: 1jpp.2%{?dist}
+Release: 2jpp.2%{?dist}
 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 
 Group: Networking/Daemons
@@ -620,7 +620,7 @@
 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}/{init.d,logrotate.d}
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/{rc.d/init.d,logrotate.d}
 %{__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 +648,7 @@
 %{__install} -m 0644 %{name} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name}
 %{__rm} %{name}
 %{__install} %{SOURCE1} \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/init.d/%{name}
+    ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/%{name}
 # Global configuration file
 %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{confdir}
 %{__cat} > %{name}.conf << EOT
@@ -700,7 +700,7 @@
     ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name} \
     ${RPM_BUILD_ROOT}%{_bindir}/d%{name} \
     ${RPM_BUILD_ROOT}%{_bindir}/%{name} \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/init.d/%{name} \
+    ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/%{name} \
     ${RPM_BUILD_ROOT}%{bindir}/relink \
     ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}; do
     %{__sed} -i -e 's|\@\@\@TCCONF\@\@\@|%{confdir}|g' \
@@ -1071,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}/init.d/%{name} stop
-    [ -f %{_sysconfdir}/init.d/%{name} ] && /sbin/chkconfig --del %{name}
+    [ -f /var/lock/subsys/%{name} ] && %{_sysconfdir}/rc.d/init.d/%{name} stop
+    [ -f %{_sysconfdir}/rc.d/init.d/%{name} ] && /sbin/chkconfig --del %{name}
     # Remove automated symlinks
     for repository in %{commondir}/endorsed; do
         find $repository -name '\[*\]*.jar' -not -type d | xargs %{__rm} -f
@@ -1149,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}/init.d/%{name}
+%attr(755,root,root) %{_sysconfdir}/rc.d/init.d/%{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
@@ -1300,6 +1300,11 @@
 %endif
 
 %changelog
+* Sat Jan 5 2008 Devrim GUNDUZ <devrim at commandprompt.com> 0:5.5.25-2jpp.1
+- Fix for bz #153187
+- Fix for bz #426850
+- Fix for bz #312561 
+
 * 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