%define tomcatnatver 1.1.27
# Java Commons Logging version. Must be >= 1.1.
-%define jclver 1.1.3
+%define jclver 1.2
-%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.63
+Version: 7.0.100
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: 29fbc490b99140a671e4c84d152caee7
+# Source0-md5: ad3d9bec243bfa25c2f66dd0961d8c83
Source1: apache-%{name}.init
Source2: apache-%{name}.sysconfig
Source3: %{name}-build.properties
Source15: %{name}.logrotate
Source16: log4j.properties
Source100: http://www.apache.org/dist/commons/logging/source/commons-logging-%{jclver}-src.tar.gz
-# Source100-md5: e8e197d628436490886d17cffa108fe3
+# Source100-md5: ce977548f1cbf46918e93cd38ac35163
Patch0: %{name}-build.xml.patch
Patch1: server.xml-URIEncoding-utf8.patch
Patch2: %{name}-LDAPUserDatabase.patch
Patch3: %{name}-catalina.policy-javadir.patch
Patch4: %{name}-userdir.patch
Patch5: logging.patch
-Patch6: jdt18.patch
+Patch6: jcl.patch
+Patch7: %{name}-build.patch
Patch100: jcl-build.xml.patch
URL: http://tomcat.apache.org/
BuildRequires: ant >= 1.5.3
BuildRequires: java-commons-daemon >= 1.0
BuildRequires: java-commons-dbcp-tomcat5 >= 0:1.1
BuildRequires: java-commons-pool-tomcat5
-BuildRequires: java-eclipse-jdt >= 4.3.1
+BuildRequires: java-eclipse-jdt >= 4.4.2
BuildRequires: java-geronimo-spec-jaxrpc
BuildRequires: java-jdbc-mysql
BuildRequires: java-junit
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p0
+%patch6 -p1
+%patch7 -p1
# Prepare java-commmons-logging sources
install -d output/extras/logging
%{_tomcatdir}/lib/servlet-api.jar
%{_tomcatdir}/lib/tomcat-jdbc.jar
%{_tomcatdir}/lib/tomcat-coyote.jar
+%{_tomcatdir}/lib/tomcat-dbcp.jar
%{_tomcatdir}/lib/tomcat-i18n-es.jar
%{_tomcatdir}/lib/tomcat-i18n-fr.jar
%{_tomcatdir}/lib/tomcat-i18n-ja.jar
+%{_tomcatdir}/lib/tomcat-i18n-ru.jar
%{_tomcatdir}/lib/tomcat7-websocket.jar
%{_tomcatdir}/lib/websocket-api.jar
%{_tomcatdir}/lib/util.jar