rpms/tomcat5/devel tomcat5-5.5-catalina.sh.patch, 1.6, 1.7 tomcat5.spec, 1.117, 1.118

[David Walluck]

Author: dwalluck

Update of /cvs/pkgs/rpms/tomcat5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3529

Modified Files:
	tomcat5-5.5-catalina.sh.patch tomcat5.spec 
Log Message:
- update catalina.sh.patch to apply with 0 fuzz

tomcat5-5.5-catalina.sh.patch:

Index: tomcat5-5.5-catalina.sh.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5-catalina.sh.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tomcat5-5.5-catalina.sh.patch	13 Oct 2008 20:58:23 -0000	1.6
+++ tomcat5-5.5-catalina.sh.patch	14 Oct 2008 02:39:02 -0000	1.7
@@ -1,6 +1,6 @@
---- container/catalina/src/bin/catalina.sh.sav	2006-03-23 17:04:08.000000000 +0100
-+++ container/catalina/src/bin/catalina.sh	2006-03-23 17:12:52.000000000 +0100
-@@ -52,6 +52,11 @@
+--- container/catalina/src/bin/catalina.sh.orig	2008-08-28 23:13:53.000000000 -0400
++++ container/catalina/src/bin/catalina.sh	2008-10-13 22:36:25.000000000 -0400
+@@ -64,6 +64,11 @@
  Darwin*) darwin=true;;
  esac
  
@@ -12,7 +12,7 @@
  # resolve links - $0 may be a softlink
  PRG="$0"
  
-@@ -97,30 +100,73 @@
+@@ -111,30 +116,73 @@
    export QIBM_MULTI_THREADED=Y
  fi
  
@@ -35,8 +35,8 @@
 -  fi
 +if [ -z "$CATALINA_HOME" ]; then
 +    [ -r "$TOMCAT_CFG" ] && . "${TOMCAT_CFG}"
-+fi
-+
+ fi
+ 
 +### Set up defaults if they were omitted in TOMCAT_CFG
 +###  JVM lookup
 +if [ -z "$JAVA_HOME" ]; then
@@ -79,8 +79,8 @@
 +        echo "Found JAVA_HOME: ${JAVA_HOME}"
 +        echo "Please complete your ${TOMCAT_CFG} so we won't have to look for it next time"
 +    fi
- fi
- 
++fi
++
 +# Set standard commands for invoking Java.
 +_RUNJAVA="$JAVA_HOME"/bin/java
 +_RUNJAVAC="$JAVA_HOME"/bin/javac
@@ -104,8 +104,8 @@
  
  if [ -z "$CATALINA_BASE" ] ; then
    CATALINA_BASE="$CATALINA_HOME"
-@@ -131,6 +179,10 @@
-   CATALINA_TMPDIR="$CATALINA_BASE"/temp
+@@ -151,6 +199,10 @@
+     have_tty=1
  fi
  
 +if [ -z "$CATALINA_PID" ] ; then
@@ -115,7 +115,7 @@
  # For Cygwin, switch paths to Windows format before running java
  if $cygwin; then
    JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"`
-@@ -290,7 +342,7 @@
+@@ -322,7 +374,7 @@
  
  else
  


Index: tomcat5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- tomcat5.spec	14 Oct 2008 02:23:23 -0000	1.117
+++ tomcat5.spec	14 Oct 2008 02:39:02 -0000	1.118
@@ -71,7 +71,7 @@
 Name: tomcat5
 Epoch: 0
 Version: %{majversion}.%{minversion}
-Release: 4.2%{dist}
+Release: 4.3%{dist}
 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 
 Group: Networking/Daemons
@@ -1348,6 +1348,9 @@
 %endif
 
 %changelog
+* Mon Oct 13 2008 David Walluck <dwalluck at redhat.com> 0:5.5.27-4.3
+- update catalina.sh.patch to apply with 0 fuzz
+
 * Mon Oct 13 2008 David Walluck <dwalluck at redhat.com> 0:5.5.27-4.2
 - use Fedora-specific changes to various API levels to allow building