X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=tomcat.spec;h=a0ec170e8acc6a3c616924680b45b0050383cde2;hb=3de7b387cbdbdd4ffec1f34089e93f6ebc57a111;hp=f2c43f6a96c02f9d97e92f8749b6409e4ef6e239;hpb=5edec8e81a2b5061426ae35f827026296fe0f693;p=packages%2Ftomcat.git

diff --git a/tomcat.spec b/tomcat.spec
index f2c43f6..a0ec170 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -12,12 +12,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.26
-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:	eb8e7192b02b6031be6fc23afea2431f
+# Source0-md5:	8f1312436629c914564f3e8d88237be3
 Source1:	apache-%{name}.init
 Source2:	apache-%{name}.sysconfig
 Source3:	%{name}-build.properties
@@ -36,8 +36,7 @@ Patch4:		%{name}-userdir.patch
 Patch100:	jcl-build.xml.patch
 URL:		http://tomcat.apache.org/
 BuildRequires:	ant >= 1.5.3
-BuildRequires:	ant-trax
-BuildRequires:	eclipse-jdt >= 3.2
+BuildRequires:	eclipse-jdt >= 4.2.2
 BuildRequires:	java(JSR109)
 BuildRequires:	java-avalon-logkit
 BuildRequires:	java-commons-daemon >= 1.0
@@ -74,7 +73,7 @@ Requires:	jpackage-utils
 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)
@@ -216,7 +215,7 @@ Biblioteki Javy zawierające serwer HTTP 1.1 dla Tomcata.
 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
@@ -278,6 +277,7 @@ logkit.jar=%(find-jar avalon-logkit)
 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
@@ -446,6 +446,7 @@ fi
 %{_tomcatdir}/lib/mysql-connector-java.jar
 %{_tomcatdir}/lib/org.eclipse.jdt.core.jar
 %{_tomcatdir}/lib/servlet-api.jar
+%{_tomcatdir}/lib/tomcat-jdbc.jar
 %{_tomcatdir}/lib/tomcat-coyote.jar
 %{_tomcatdir}/lib/tomcat-i18n-es.jar
 %{_tomcatdir}/lib/tomcat-i18n-fr.jar