rpms/tomcat5/devel tomcat5-5.5-http11-build.patch, 1.5, 1.6 tomcat5-5.5-jk-build.patch, 1.5, 1.6 tomcat5-5.5-jspc.sh.patch, 1.4, 1.5 tomcat5-5.5-skip-jsp-precompile.patch, 1.2, 1.3 tomcat5.spec, 1.118, 1.119
David Walluck
dwalluck at fedoraproject.org
Tue Oct 14 15:18:45 UTC 2008
Author: dwalluck
Update of /cvs/pkgs/rpms/tomcat5/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11308
Modified Files:
tomcat5-5.5-http11-build.patch tomcat5-5.5-jk-build.patch
tomcat5-5.5-jspc.sh.patch
tomcat5-5.5-skip-jsp-precompile.patch tomcat5.spec
Log Message:
- make patches to apply with 0 fuzz again
tomcat5-5.5-http11-build.patch:
Index: tomcat5-5.5-http11-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5-http11-build.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tomcat5-5.5-http11-build.patch 14 Jul 2008 16:26:18 -0000 1.5
+++ tomcat5-5.5-http11-build.patch 14 Oct 2008 15:18:44 -0000 1.6
@@ -1,6 +1,6 @@
---- connectors/http11/build.xml.orig 2008-07-14 11:45:53.000000000 -0400
-+++ connectors/http11/build.xml 2008-07-14 11:51:44.000000000 -0400
-@@ -48,7 +48,7 @@
+--- 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"/>
@@ -9,7 +9,7 @@
<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"/>
-@@ -186,7 +186,10 @@
+@@ -169,7 +169,10 @@
deprecation="${compile.deprecation}"
optimize="${compile.optimize}">
<exclude name="org\apache\coyote\http11\*Apr*" unless="jdk.1.4.present" />
tomcat5-5.5-jk-build.patch:
Index: tomcat5-5.5-jk-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5-jk-build.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tomcat5-5.5-jk-build.patch 13 Oct 2008 20:58:23 -0000 1.5
+++ tomcat5-5.5-jk-build.patch 14 Oct 2008 15:18:45 -0000 1.6
@@ -1,6 +1,6 @@
---- connectors/jk/build.xml.p14 2006-03-05 02:25:22.000000000 +0100
-+++ connectors/jk/build.xml 2006-03-23 19:25:51.000000000 +0100
-@@ -28,7 +28,7 @@
+--- connectors/jk/build.xml.p14 2008-07-14 11:55:14.000000000 -0400
++++ connectors/jk/build.xml 2008-07-14 11:58:29.000000000 -0400
+@@ -45,7 +45,7 @@
<property name="tomcat-jkshm.jar" value="${jk.build}/lib/jkshm.jar" />
<property name="tomcat-jk2.jar" value="${jk.build}/lib/tomcat-jk2.jar" />
<property name="tomcat-jni.jar" value="${jk.build}/lib/tomcat-jni.jar" />
@@ -9,7 +9,7 @@
<!-- default locations, overrident by properties -->
<property name="base.path" location="/usr/share/java"/>
-@@ -211,6 +211,7 @@
+@@ -230,6 +230,7 @@
<exclude name="org/apache/jk/ant/**" />
<classpath>
<pathelement location="${tomcat-apr.jar}" />
@@ -17,7 +17,7 @@
<path refid="xml-apis.classpath"/>
<path refid="build-main.classpath"/>
</classpath>
-@@ -252,6 +252,7 @@
+@@ -269,6 +270,7 @@
<include name="org/apache/coyote/ajp/**"/>
<include name="org/apache/jk/config/**"/>
<classpath>
tomcat5-5.5-jspc.sh.patch:
Index: tomcat5-5.5-jspc.sh.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5-jspc.sh.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tomcat5-5.5-jspc.sh.patch 13 Oct 2008 20:58:23 -0000 1.4
+++ tomcat5-5.5-jspc.sh.patch 14 Oct 2008 15:18:45 -0000 1.5
@@ -1,6 +1,6 @@
---- jasper/src/bin/jspc.sh.sav 2006-03-23 17:33:40.000000000 +0100
-+++ jasper/src/bin/jspc.sh 2006-03-23 17:35:26.000000000 +0100
-@@ -5,32 +5,9 @@
+--- jasper/src/bin/jspc.sh.sav 2008-07-14 11:30:15.000000000 -0400
++++ jasper/src/bin/jspc.sh 2008-07-14 11:31:25.000000000 -0400
+@@ -21,32 +21,9 @@
# $Id$
# -----------------------------------------------------------------------------
tomcat5-5.5-skip-jsp-precompile.patch:
Index: tomcat5-5.5-skip-jsp-precompile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5-skip-jsp-precompile.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tomcat5-5.5-skip-jsp-precompile.patch 14 Jul 2008 16:26:18 -0000 1.2
+++ tomcat5-5.5-skip-jsp-precompile.patch 14 Oct 2008 15:18:45 -0000 1.3
@@ -1,5 +1,5 @@
---- build/build.xml.orig 2008-07-14 12:04:11.000000000 -0400
-+++ build/build.xml 2008-07-14 12:04:34.000000000 -0400
+--- build/build.xml~ 2008-10-14 11:14:21.000000000 -0400
++++ build/build.xml 2008-10-14 11:14:21.000000000 -0400
@@ -456,6 +456,7 @@
<classpath refid="jspc.classpath"/>
</taskdef>
Index: tomcat5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- tomcat5.spec 14 Oct 2008 02:39:02 -0000 1.118
+++ tomcat5.spec 14 Oct 2008 15:18:45 -0000 1.119
@@ -71,7 +71,7 @@
Name: tomcat5
Epoch: 0
Version: %{majversion}.%{minversion}
-Release: 4.3%{dist}
+Release: 4.4%{dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
Group: Networking/Daemons
@@ -1348,6 +1348,9 @@
%endif
%changelog
+* Tue Oct 14 2008 David Walluck <dwalluck at redhat.com> 0:5.5.27-4.4
+- make patches to apply with 0 fuzz again
+
* 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
More information about the scm-commits
mailing list