- up to 7.0.106

diff --git a/tomcat-build.xml.patch b/tomcat-build.xml.patch
index ddd27972d2fc21483a84313ec5aa51206ce45803..9f1726abc63c6a84fece2ae59ef5c3628397f197 100644 (file)
--- a/tomcat-build.xml.patch
+++ b/tomcat-build.xml.patch
@@ -27,7 +27,7 @@
            if="${cobertura.enabled}"
            description="Adds Cobertura instrumentation to the compiled bytecode">
  
-@@ -1681,67 +1681,10 @@
+@@ -1667,66 +1667,10 @@
      <mkdir dir="${tomcat.extras}/webservices"/>
    </target>
  
@@ -35,9 +35,8 @@
 -          depends="extras-prepare"
 -          description="Prepare to build web services extras package">
 -
--    <antcall target="downloadfile-2">
--      <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/>
--      <param name="sourcefile.2" value="${commons-logging-src.loc.2}"/>
+-    <antcall target="downloadfile">
+-      <param name="sourcefile" value="${commons-logging-src.loc}"/>
 -      <param name="destfile" value="${commons-logging-src.tar.gz}"/>
 -      <param name="destdir" value="${commons-logging.home}"/>
 -      <param name="checksum.enabled" value="${commons-logging-src.checksum.enabled}"/>

diff --git a/tomcat.spec b/tomcat.spec
index e8343e2e6b9ffbb9d7fcd604208a8b7c267f3d62..b0b278163854b738a80a0d61a2a03a449bf0dccf 100644 (file)
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -14,12 +14,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.100
+Version:       7.0.106
 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: ad3d9bec243bfa25c2f66dd0961d8c83
+# Source0-md5: 0f40e24aa3ea0a5188ac3973d54d1650
 Source1:       apache-%{name}.init
 Source2:       apache-%{name}.sysconfig
 Source3:       %{name}-build.properties