[packages/tomcat] - up to 7.0.85
arekm
arekm at pld-linux.org
Tue Apr 10 08:11:23 CEST 2018
commit c0be1349961af00f2983f8809ac99e84689cc850
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Apr 10 08:11:15 2018 +0200
- up to 7.0.85
tomcat-build.xml.patch | 29 +++++++++++++++--------------
tomcat.spec | 4 ++--
2 files changed, 17 insertions(+), 16 deletions(-)
---
diff --git a/tomcat.spec b/tomcat.spec
index bc4e6c3..731756f 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -15,12 +15,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: 7.0.82
+Version: 7.0.85
Release: 1
License: Apache v2.0
Group: Networking/Daemons/Java
Source0: http://www.apache.org/dist/tomcat/tomcat-7/v%{version}/src/apache-%{name}-%{version}-src.tar.gz
-# Source0-md5: 66d14623b2de908cce36a0290e5cd49a
+# Source0-md5: 13fa23dad2c994b0f0f0fc0548865e29
Source1: apache-%{name}.init
Source2: apache-%{name}.sysconfig
Source3: %{name}-build.properties
diff --git a/tomcat-build.xml.patch b/tomcat-build.xml.patch
index b4b4e2d..487f131 100644
--- a/tomcat-build.xml.patch
+++ b/tomcat-build.xml.patch
@@ -9,20 +9,6 @@
<!-- Compile internal server components -->
<javac srcdir="java" destdir="${tomcat.classes}"
debug="${compile.debug}"
-@@ -937,13 +883,6 @@
- <target name="deploy" depends="package,build-docs"
- description="Default. Builds a working Tomcat instance">
-
-- <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 scripts -->
- <copy todir="${tomcat.build}/bin">
- <fileset dir="bin">
@@ -1198,7 +1198,7 @@
</target>
@@ -133,3 +119,18 @@
<mkdir dir="${tomcat.dist}"/>
<mkdir dir="${tomcat.dist}/bin"/>
<mkdir dir="${tomcat.dist}/conf"/>
+@@ -1832,13 +1832,6 @@
+ </fileset>
+ </copy>
+
+- <!-- Source bundles for native components -->
+- <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
+- file="${tomcat-native.tar.gz}" />
+- <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
+- file="${commons-daemon.native.src.tgz}" />
+-
+- <!-- platform README files -->
+ <echo append="false" file="${tomcat.dist}/bin/x64/README">
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ </echo>
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/tomcat.git/commitdiff/c0be1349961af00f2983f8809ac99e84689cc850
More information about the pld-cvs-commit
mailing list