[tomcat5] Forgotten patch.

Alexander Kurtakov akurtakov at fedoraproject.org
Thu Oct 21 11:22:42 UTC 2010


commit 3016a03c30688c06a57c1e9c952b984f09257fba
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Thu Oct 21 14:22:27 2010 +0300

    Forgotten patch.

 tomcat5-5.5-nonative.patch |   43 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 43 insertions(+), 0 deletions(-)
---
diff --git a/tomcat5-5.5-nonative.patch b/tomcat5-5.5-nonative.patch
new file mode 100644
index 0000000..7221ed7
--- /dev/null
+++ b/tomcat5-5.5-nonative.patch
@@ -0,0 +1,43 @@
+--- build/build.xml.sav	2010-10-20 21:44:14.918381952 +0300
++++ build/build.xml	2010-10-20 21:44:33.966112480 +0300
+@@ -224,11 +224,6 @@
+ 
+     <copy todir="${tomcat.build}/server/lib" file="${commons-modeler.jar}" />
+ 
+-    <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
+-            file="${tomcat-native.tar.gz}" />
+-    <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
+-            file="${commons-daemon.native.src.tgz}" />
+-
+     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
+ 
+     <!-- <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
+@@ -1403,28 +1398,6 @@
+     <!-- Bugzilla 37035: http://issues.apache.org/bugzilla/show_bug.cgi?id=37035 -->
+     <touch file="${tomcat.dist}/temp/bugzilla37035-safeToDelete.tmp" />
+ 
+-    <!-- Windows binaries for each platform -->
+-    <!-- 32 bit -->
+-    <copy file="${commons-daemon.home}/windows/prunsrv.exe"
+-        tofile="${tomcat.dist}/bin/tomcat${version.major}.exe" />
+-    <copy file="${commons-daemon.home}/windows/prunmgr.exe"
+-        tofile="${tomcat.dist}/bin/tomcat${version.major}w.exe" />
+-    <!-- 64 bit amd -->
+-    <copy file="${commons-daemon.home}/windows/amd64/prunsrv.exe"
+-        tofile="${tomcat.dist}/bin/x64/tomcat${version.major}.exe" />
+-    <!-- 64 bit ia -->
+-    <copy file="${commons-daemon.home}/windows/ia64/prunsrv.exe"
+-        tofile="${tomcat.dist}/bin/i64/tomcat${version.major}.exe" />
+-    <!-- tc native -->
+-    <copy file="${tomcat-native.home}/tcnative-1.dll.x86"
+-          tofile="${tomcat.dist}/bin/tcnative-1.dll" />
+-    <!-- tc native 64 bit for amd/emt -->
+-    <copy file="${tomcat-native.home}/tcnative-1.dll.x64"
+-          tofile="${tomcat.dist}/bin/x64/tcnative-1.dll" />
+-    <!-- tc native 64 bit for ia -->
+-    <copy file="${tomcat-native.home}/tcnative-1.dll.i64"
+-          tofile="${tomcat.dist}/bin/i64/tcnative-1.dll" />
+-
+     <!-- Correct permissions and line endings on "bin" scripts -->
+     <fixcrlf srcdir="${tomcat.dist}/bin"   includes="*.sh"  eol="lf"
+         encoding="ISO-8859-1" fixlast="false" />


More information about the scm-commits mailing list