- up to 7.0.50

diff --git a/tomcat-build.xml.patch b/tomcat-build.xml.patch
index 68fade3f4f9a11bd6e5f8c1d2f4d38c6fa7c1aff..3f58369fadede7b488bdb11496333c65418f07a0 100644 (file)
--- a/tomcat-build.xml.patch
+++ b/tomcat-build.xml.patch
@@ -61,12 +61,12 @@
    <target name="validate-eoln" depends="build-prepare,compile-prepare"
      description="Validate that the source files have correct line ends">
  
-@@ -552,7 +498,7 @@
-     </copy>
-   </target>
+@@ -531,7 +531,7 @@
+   <target name="compile" depends="compile-java6,compile-java7" />
  
--  <target name="compile" depends="build-prepare,download-compile,compile-prepare,validate">
-+  <target name="compile" depends="build-prepare">
+   <target name="compile-java6"
+-          depends="build-prepare,download-compile,compile-prepare,validate">
++          depends="build-prepare">
      <!-- Compile internal server components -->
      <javac srcdir="java" destdir="${tomcat.classes}"
             debug="${compile.debug}"
@@ -93,7 +93,16 @@
      <mkdir dir="${test.classes}"/>
      <!-- Compile -->
      <javac srcdir="test" destdir="${test.classes}"
-@@ -1240,52 +1179,10 @@
+@@ -1280,7 +1280,7 @@
+     </path>
+   </target>
+ 
+-  <target name="cobertura-instrument" depends="compile,download-cobertura,cobertura-disabled"
++  <target name="cobertura-instrument" depends="compile,cobertura-disabled"
+           if="${test.cobertura}"
+           description="Adds Cobertura instrumentation to the compiled bytecode">
+ 
+@@ -1339,52 +1339,10 @@
      <mkdir dir="${tomcat.extras}/webservices"/>
    </target>
  
@@ -136,7 +145,7 @@
 -
    <target name="extras-commons-logging"
 -          depends="extras-commons-logging-prepare,compile,build-manifests"
-+          depends="extras-prepare,compile,build-manifests"
++          depends="compile,build-manifests"
            description="Build JULI for log4j extras package">
  
 -    <gunzip src="${commons-logging-src.tar.gz}"
@@ -144,7 +153,7 @@
 -    <untar src="${tomcat.extras}/logging/commons-logging-src.tar"
 -      dest="${tomcat.extras}/logging/"/>
 -
-     <replace dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/java/org/apache/commons"
+     <replace dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/main/java/org/apache/commons"
          encoding="ISO-8859-1">
        <replacefilter token="org.apache.commons"
 @@ -1307,7 +1204,8 @@
@@ -185,7 +194,7 @@
      <mkdir dir="${tomcat.dist}"/>
      <mkdir dir="${tomcat.dist}/bin"/>
      <mkdir dir="${tomcat.dist}/conf"/>
-@@ -2297,290 +2183,6 @@
+@@ -2458,307 +2458,6 @@ Apache Tomcat ${version} native binaries
      <delete file="webapps/docs/jdbc-pool.xml"/>
    </target>
  
@@ -264,10 +273,27 @@
 -  <target name="download-test-compile"
 -          description="Download additional components for the tests" >
 -
--    <antcall target="downloadzip">
+-    <antcall target="downloadfile">
 -      <param name="sourcefile" value="${junit.loc}"/>
 -      <param name="destfile" value="${junit.jar}"/>
--      <param name="destdir" value="${base.path}"/>
+-      <param name="destdir" value="${junit.home}"/>
+-    </antcall>
+-
+-    <antcall target="downloadfile">
+-      <param name="sourcefile" value="${hamcrest.loc}"/>
+-      <param name="destfile" value="${hamcrest.jar}"/>
+-      <param name="destdir" value="${hamcrest.home}"/>
+-    </antcall>
+-
+-  </target>
+-
+-  <target name="download-cobertura"
+-          if="${test.cobertura}"
+-          description="Download the Cobertura code coverage tool" >
+-
+-    <antcall target="downloadgz">
+-      <param name="sourcefile" value="${cobertura.loc}"/>
+-      <param name="destfile" value="${cobertura.jar}"/>
 -    </antcall>
 -
 -  </target>

diff --git a/tomcat.spec b/tomcat.spec
index bfca9bfdbb7c3cebb185ccac332b48d5fcae411e..60995ba073ee2cc056e94a8517edeaaddabd4245 100644 (file)
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -8,18 +8,18 @@
 %define                tomcatnatver    1.1.27
 
 # Java Commons Logging version. Must be >= 1.1.
-%define                jclver  1.1.1
+%define                jclver  1.1.3
 
 %include       /usr/lib/rpm/macros.java
 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.41
-Release:       10
+Version:       7.0.50
+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: 8f1312436629c914564f3e8d88237be3
+# Source0-md5: fd439af0886873717e9b93206461e643
 Source1:       apache-%{name}.init
 Source2:       apache-%{name}.sysconfig
 Source3:       %{name}-build.properties
@@ -30,7 +30,7 @@ Source13:     %{name}-context-host-manager.xml
 Source14:      %{name}-context-examples.xml
 Source15:      %{name}.logrotate
 Source100:     http://www.apache.org/dist/commons/logging/source/commons-logging-%{jclver}-src.tar.gz
-# Source100-md5:       e5cfa8cca13152d7545fde6b1783c60a
+# Source100-md5:       e8e197d628436490886d17cffa108fe3
 Patch0:                %{name}-build.xml.patch
 Patch1:                server.xml-URIEncoding-utf8.patch
 Patch2:                %{name}-LDAPUserDatabase.patch
@@ -288,6 +288,7 @@ if test ! -e build.properties.local; then
        avalon-framework-api.jar=$(find-jar avalon-framework-api.jar)
        servletapi.jar=$(pwd)/output/build/lib/servlet-api.jar
        commons-logging.version=%{jclver}
+       java.7.home=%{java_home}
        EOF
        cat build.properties.local >> build.properties
 fi
@@ -498,6 +499,8 @@ fi
 %{_tomcatdir}/lib/tomcat-i18n-es.jar
 %{_tomcatdir}/lib/tomcat-i18n-fr.jar
 %{_tomcatdir}/lib/tomcat-i18n-ja.jar
+%{_tomcatdir}/lib/tomcat7-websocket.jar
+%{_tomcatdir}/lib/websocket-api.jar
 %{_tomcatdir}/lib/util.jar
 
 %dir %{_tomcatdir}/webapps