X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache-tomcat-skip-servletapi.patch;h=124f5504b33588901b4aab93f0377cd198bd67c5;hb=d87490f3916ea06f25110d2727b165175004f979;hp=2c27a65f2d460e9c7ad4dc794443382ce421b7e0;hpb=97eb666ecc93d85ce7687130fba2f4834382e6aa;p=packages%2Fapache-tomcat.git

diff --git a/apache-tomcat-skip-servletapi.patch b/apache-tomcat-skip-servletapi.patch
index 2c27a65..124f550 100644
--- a/apache-tomcat-skip-servletapi.patch
+++ b/apache-tomcat-skip-servletapi.patch
@@ -1,6 +1,23 @@
---- apache-tomcat-5.5.23-src/build/build.xml~	2007-03-05 17:27:32.000000000 +0200
-+++ apache-tomcat-5.5.23-src/build/build.xml	2007-04-12 00:29:27.044280476 +0300
-@@ -649,8 +649,8 @@
+--- apache-tomcat-5.5.23-src/build/build.xml~	2007-04-12 00:32:27.088341587 +0300
++++ apache-tomcat-5.5.23-src/build/build.xml	2007-04-12 00:32:28.698377904 +0300
+@@ -99,16 +99,6 @@
+     <mkdir dir="${tomcat.build}/server/lib" />
+     <mkdir dir="${tomcat.build}/common/lib" />
+ 
+-    <uptodate property="servletapi.build.notrequired"
+-              targetfile="${servlet-api.jar}">
+-      <srcfiles dir="${api.home}/jsr154/src" includes="**" />
+-    </uptodate>
+-
+-    <uptodate property="jspapi.build.notrequired"
+-              targetfile="${jsp-api.jar}">
+-      <srcfiles dir="${api.home}/jsr152/src" includes="**" />
+-    </uptodate>
+-
+     <uptodate property="tomcatutil.build.notrequired"
+               targetfile="${tomcat.build}/server/lib/tomcat-util.jar">
+       <srcfiles dir="${jtc.home}/util/java" includes="**" />
+@@ -649,8 +639,8 @@
  
    <target name="build-depends" depends="init"
            description="Builds various dependent components - APIs, commons-el, commons-modeler, daemon">