%define servletapiver 3.0
# Java Commons Logging version. Must be >= 1.1.
-%define jclver 1.1.3
+%define jclver 1.1.1
%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.40
-Release: 1
+Version: 7.0.41
+Release: 2
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: 158df72e6c046fa5d46a691a7c0805e6
+# Source0-md5: 8f1312436629c914564f3e8d88237be3
Source1: apache-%{name}.init
Source2: apache-%{name}.sysconfig
Source3: %{name}-build.properties
Source13: %{name}-context-host-manager.xml
Source14: %{name}-context-examples.xml
Source100: http://www.apache.org/dist/commons/logging/source/commons-logging-%{jclver}-src.tar.gz
-# Source100-md5: e8e197d628436490886d17cffa108fe3
+# Source100-md5: e5cfa8cca13152d7545fde6b1783c60a
Patch0: %{name}-build.xml.patch
Patch1: server.xml-URIEncoding-utf8.patch
Patch2: %{name}-LDAPUserDatabase.patch
Patch100: jcl-build.xml.patch
URL: http://tomcat.apache.org/
BuildRequires: ant >= 1.5.3
-BuildRequires: eclipse-jdt >= 3.2
+BuildRequires: eclipse-jdt >= 4.2.2
BuildRequires: java(JSR109)
BuildRequires: java-avalon-logkit
BuildRequires: java-commons-daemon >= 1.0
Requires: jre >= 1.2
Requires: jsvc
Requires: rc-scripts
-Suggests: tomcat-native
+Suggests: tomcat-native >= 1.1.27
Provides: group(servlet)
Provides: group(tomcat)
Provides: user(tomcat)
Summary: JSP compiler
Summary(pl.UTF-8): Kompilator JSP
Group: Libraries/Java
-Requires: java-eclipse-jdt >= 3.2
+Requires: java-eclipse-jdt >= 4.2.2
Requires: jpackage-utils
Obsoletes: apache-tomcat-jasper
Obsoletes: tomcat-jasper
avalon-framework-impl.jar=%(find-jar avalon-framework-impl.jar)
avalon-framework-api.jar=%(find-jar avalon-framework-api.jar)
servletapi.jar=$(pwd)/output/build/lib/servlet-api.jar
+commons-logging.version=%{jclver}
EOF
%build