[packages/tomcat/TOMCAT_6] - up to 6.0.36
arekm
arekm at pld-linux.org
Mon Nov 19 14:59:05 CET 2012
commit fe60811dc476d8fde75dd7657007531086624b5e
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Mon Nov 19 14:59:01 2012 +0100
- up to 6.0.36
tomcat-extras.xml.patch | 81 ++++++++++++++++++++++++-------------------------
tomcat.spec | 12 +++++---
2 files changed, 48 insertions(+), 45 deletions(-)
---
diff --git a/tomcat.spec b/tomcat.spec
index 8f790c3..c1c91f4 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -10,12 +10,12 @@
Summary: Web server and Servlet/JSP Engine, RI for Servlet %{servletapiver}/JSP %{jspapiver} API
Summary(pl.UTF-8): Serwer www i silnik Servlet/JSP będący wzorcową implementacją API Servlet %{servletapiver}/JSP %{jspapiver}
Name: tomcat
-Version: 6.0.32
+Version: 6.0.36
Release: 1
License: Apache v2.0
Group: Networking/Daemons/Java
Source0: http://www.apache.org/dist/tomcat/tomcat-6/v%{version}/src/apache-%{name}-%{version}-src.tar.gz
-# Source0-md5: 19a1eaa9c9938b520d3c360d8cf4af22
+# Source0-md5: 654318c1e88fdc8b7b5182c4479612b1
Source1: apache-%{name}.init
Source2: apache-%{name}.sysconfig
Source3: %{name}-build.properties
@@ -32,7 +32,6 @@ Patch4: %{name}-catalina.policy-javadir.patch
Patch5: %{name}-userdir.patch
URL: http://tomcat.apache.org/
BuildRequires: ant >= 1.5.3
-BuildRequires: ant-trax
BuildRequires: java-commons-daemon >= 1.0
BuildRequires: java-commons-dbcp-tomcat5 >= 0:1.1
BuildRequires: java-commons-pool-tomcat5
@@ -221,7 +220,7 @@ javax.servlet.http, javax.servlet.jsp i java.servlet.jsp.tagext).
%prep
%setup -q -n apache-%{name}-%{version}-src
%patch0 -p0
-%patch1 -p0
+%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
@@ -233,6 +232,11 @@ rm bin/{startup,shutdown}.sh
cp -a %{SOURCE3} build.properties
+cat >>build.properties <<EOF
+jaxrpc-lib.jar=%(find-jar geronimo-spec-jaxrpc)
+wsdl4j-lib.jar=%(find-jar wsdl4j.jar)
+EOF
+
%build
TOPDIR=$(pwd)
diff --git a/tomcat-extras.xml.patch b/tomcat-extras.xml.patch
index 6220354..d50bc4a 100644
--- a/tomcat-extras.xml.patch
+++ b/tomcat-extras.xml.patch
@@ -1,6 +1,6 @@
---- extras.xml.orig 2011-02-02 20:07:31.000000000 +0100
-+++ extras.xml 2011-02-04 20:28:23.759726852 +0100
-@@ -108,44 +108,7 @@
+--- apache-tomcat-6.0.36-src/extras.xml.org 2012-11-19 14:49:48.160094084 +0100
++++ apache-tomcat-6.0.36-src/extras.xml 2012-11-19 14:50:11.987324683 +0100
+@@ -108,45 +108,7 @@
<delete dir="${tomcat.extras}"/>
</target>
@@ -8,8 +8,9 @@
- depends="prepare"
- description="Prepare to build web services extras package">
-
-- <antcall target="downloadfile">
-- <param name="sourcefile" value="${commons-logging-src.loc}"/>
+- <antcall target="downloadfile-2">
+- <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/>
+- <param name="sourcefile.2" value="${commons-logging-src.loc.2}"/>
- <param name="destfile" value="${commons-logging-src.tar.gz}"/>
- <param name="destdir" value="${commons-logging.home}"/>
- </antcall>
@@ -45,7 +46,7 @@
description="Build JULI for log4j extras package">
<gunzip src="${commons-logging-src.tar.gz}"
-@@ -236,18 +199,6 @@
+@@ -237,18 +199,6 @@
depends="prepare"
description="Prepare to build web services extras package">
@@ -64,20 +65,7 @@
<copy file="${jaxrpc-lib.jar}"
tofile="${tomcat.extras}/webservices/jaxrpc.jar" />
<copy file="${wsdl4j-lib.jar}"
-@@ -326,25 +277,11 @@
- </condition>
- </target>
-
-- <target name="setproxy" depends="proxyflags" if="useproxy">
-- <taskdef name="setproxy"
-- classname="org.apache.tools.ant.taskdefs.optional.net.SetProxy" />
-- <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
-- proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
-- <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
-- </target>
--
- <target name="testexist">
- <echo message="Testing for ${destfile}"/>
+@@ -340,44 +290,6 @@
<available file="${destfile}" property="exist"/>
</target>
@@ -87,27 +75,38 @@
- <get src="${sourcefile}" dest="${destfile}" />
- </target>
-
- <!-- Helper target, used to create a md5 checksum file -->
- <!-- Requires 'file' as a parameter. -->
- <target name="md5sum">
---- extras.xml~ 2011-02-04 20:30:36.817322838 +0100
-+++ extras.xml 2011-02-04 20:48:43.431125625 +0100
-@@ -195,18 +195,7 @@
- </antcall>
- </target>
-
-- <target name="webservices-prepare"
-- depends="prepare"
-- description="Prepare to build web services extras package">
+- <target name="downloadfile-2" unless="exist" depends="testexist">
+- <!-- Download the file from the two alternative locations -->
+- <mkdir dir="${destdir}" />
-
-- <copy file="${jaxrpc-lib.jar}"
-- tofile="${tomcat.extras}/webservices/jaxrpc.jar" />
-- <copy file="${wsdl4j-lib.jar}"
-- tofile="${tomcat.extras}/webservices/wsdl4j.jar" />
+- <antcall target="trydownload">
+- <param name="sourcefile" value="${sourcefile.1}" />
+- </antcall>
+-
+- <antcall target="trydownload">
+- <param name="sourcefile" value="${sourcefile.2}" />
+- </antcall>
+-
+- <available file="${destfile}" property="exist"/>
+- <fail unless="exist" message="Failed to download [${destfile}]. All download sources are unavailable." />
- </target>
-
- <target name="webservices"
-- depends="webservices-prepare"
- description="Build web services extras package">
-
- <!-- Classpath -->
+- <target name="trydownload.check" depends="setproxy">
+- <condition property="trydownload.run">
+- <and>
+- <not>
+- <available file="${destfile}" />
+- </not>
+- <http url="${sourcefile}" />
+- </and>
+- </condition>
+- </target>
+-
+- <target name="trydownload" if="trydownload.run" depends="trydownload.check">
+- <!-- Downloads a file if not yet downloaded and the source URL is available -->
+- <get src="${sourcefile}" dest="${destfile}" />
+- </target>
+-
+ <!-- Helper target, used to create a md5 checksum file -->
+ <!-- Requires 'file' as a parameter. -->
+ <target name="md5sum">
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/tomcat.git/commitdiff/fe60811dc476d8fde75dd7657007531086624b5e
More information about the pld-cvs-commit
mailing list