rpms/tomcat5/devel tomcat5-5.5-http11-build.patch, 1.3, 1.4 tomcat5.spec, 1.103, 1.104 tomcat5-5.5.23-http11-build.patch, 1.1, NONE tomcat5-5.5.25-http11-build.patch, 1.1, NONE

[Devrim GÜNDÜZ (devrim)]

Author: devrim

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

Modified Files:
	tomcat5.spec 
Added Files:
	tomcat5-5.5-http11-build.patch 
Removed Files:
	tomcat5-5.5.23-http11-build.patch 
	tomcat5-5.5.25-http11-build.patch 
Log Message:
Change name of patch13 to match with the other patches. This change was already in F-7 and F-8.


tomcat5-5.5-http11-build.patch:

Index: tomcat5-5.5-http11-build.patch
===================================================================
RCS file: tomcat5-5.5-http11-build.patch
diff -N tomcat5-5.5-http11-build.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tomcat5-5.5-http11-build.patch	17 Nov 2007 00:35:30 -0000	1.4
@@ -0,0 +1,23 @@
+--- connectors/http11/build.xml.orig	2007-02-26 10:27:04.000000000 -0500
++++ connectors/http11/build.xml		2007-02-26 10:28:11.000000000 -0500
+@@ -31,7 +31,7 @@
+ 
+   <!-- The locations of necessary jar files -->
+   <property name="tomcat-util.jar"  value="${util.home}/build/lib/tomcat-util.jar"/>
+-  <property name="tomcat-jni.jar" value="../jni/dist/tomcat-native-1.0.0.jar" />
++  <property name="tomcat-jni.jar" value="../../build/build/server/lib/tomcat-apr.jar" />
+   <property name="tomcat-coyote.jar" value="${coyote.home}/build/lib/tomcat-coyote.jar"/>
+   <property name="tomcat33-coyote.jar" 
+           value="${coyote.home}/build/lib/tomcat33-coyote.jar"/>
+@@ -169,7 +169,10 @@
+        deprecation="${compile.deprecation}"
+           optimize="${compile.optimize}">
+       <exclude name="org\apache\coyote\http11\*Apr*" unless="jdk.1.4.present" />
+-      <classpath refid="compile.classpath"/>
++      <classpath>
++         <path refid="compile.classpath"/>
++         <pathelement location="${build.home}/../../jakarta-tomcat-5/build/classes"/>
++      </classpath>
+     </javac>
+     <copy    todir="${build.home}/classes" filtering="on">
+       <fileset dir="${source.home}" excludes="**/*.java"/>


Index: tomcat5.spec
===================================================================
RCS file: /cvs/extras/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- tomcat5.spec	16 Nov 2007 20:44:14 -0000	1.103
+++ tomcat5.spec	17 Nov 2007 00:35:30 -0000	1.104
@@ -95,7 +95,7 @@
 Patch9: %{name}-%{majversion}-jspc.sh.patch
 Patch10: %{name}-%{majversion}-setclasspath.sh.patch
 Patch12: %{name}-%{majversion}-util-build.patch
-Patch13: %{name}-%{version}-http11-build.patch
+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


--- tomcat5-5.5.23-http11-build.patch DELETED ---


--- tomcat5-5.5.25-http11-build.patch DELETED ---