X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=tomcat.spec;h=0a50905eb285c7a8c3f39814281e05385bc9b919;hb=a798ef66d4f847aab7f623d6aeaab29f271e3848;hp=90462a5b996fd1a64d5f84931f037d39ff549fd1;hpb=0f154dd6f3029292b4ca0a1d7fdaea666bfa8176;p=packages%2Ftomcat.git

diff --git a/tomcat.spec b/tomcat.spec
index 90462a5..0a50905 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.12
+Version:	7.0.40
 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:	edfd253c21b51ccadce8ec05be5e61fb
+# Source0-md5:	158df72e6c046fa5d46a691a7c0805e6
 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
@@ -62,14 +61,14 @@ Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
 Requires:	java(jaxp_parser_impl)
 Requires:	java(jndi) >= 1.2.1
-Requires:	java-%{name}-catalina = %{epoch}:%{version}-%{release}
-Requires:	java-%{name}-coyote = %{epoch}:%{version}-%{release}
-Requires:	java-%{name}-jasper = %{epoch}:%{version}-%{release}
+Requires:	java-%{name}-catalina = %{version}-%{release}
+Requires:	java-%{name}-coyote = %{version}-%{release}
+Requires:	java-%{name}-jasper = %{version}-%{release}
 Requires:	java-commons-dbcp-tomcat5 >= 0:1.1
 Requires:	java-commons-pool-tomcat5
 Requires:	java-jdbc-mysql
 Requires:	java-mail
-Requires:	java-servletapi = %{epoch}:%{version}-%{release}
+Requires:	java-servletapi = %{version}-%{release}
 Requires:	jpackage-utils
 Requires:	jre >= 1.2
 Requires:	jsvc
@@ -123,7 +122,7 @@ Dokumentacja do Tomcata - kontenera Servlet/JSP.
 Summary:	The Apache Tomcat Servlet/JSP application manager
 Summary(pl.UTF-8):	Zarządca aplikacji w Tomcacie
 Group:		Networking/Daemons/Java/Servlets
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description webapp-manager
 The Apache Tomcat Servlet/JSP application manager.
@@ -135,7 +134,7 @@ Zarządca aplikacji w Tomcacie.
 Summary:	The Apache Tomcat Servlet/JSP virtual hosts manager
 Summary(pl.UTF-8):	Zarządca wirtualnych hostów w Tomcacie
 Group:		Networking/Daemons/Java/Servlets
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Obsoletes:	tomcat-admin
 
 %description webapp-host-manager
@@ -148,7 +147,7 @@ Zarządca wirtualnych hostów w Tomcacie.
 Summary:	The Apache Tomcat Servlet/JSP example applications
 Summary(pl.UTF-8):	Przykładowe aplikacje dla Tomcata
 Group:		Networking/Daemons/Java/Servlets
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description webapp-examples
 The Apache Tomcat Servlet/JSP example applications.
@@ -160,7 +159,7 @@ Przykładowe aplikacje dla Tomcata.
 Summary:	Web Services support (JSR 109)
 Summary(pl.UTF-8):	Wsparcie dla Web Services (JSR 109)
 Group:		Libraries/Java
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 Requires:	java(JSR109)
 Requires:	java-geronimo-spec-jaxrpc
 
@@ -175,7 +174,7 @@ Wsparcie dla JSR 109 (Web Services).
 Summary:	JMX remote interface for Tomcat
 Summary(pl.UTF-8):	Zdalny interfejs JMX dla Tomcata
 Group:		Libraries/Java
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description jmx
 JMX remote interface for 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
@@ -236,8 +235,8 @@ Group:		Libraries/Java
 Provides:	java(jsp) = %{jspapiver}
 Provides:	java(servlet) = %{servletapiver}
 Obsoletes:	jakarta-servletapi5
-Obsoletes:	java-servletapi5
 Obsoletes:	jakarta-servletapi5
+Obsoletes:	java-servletapi5
 
 %description -n java-servletapi
 Implementation classes of the Java Servlet and JSP APIs (packages
@@ -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
@@ -417,7 +417,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc KEYS RELEASE-NOTES TOMCAT-7-RELEASE-PLAN.txt
+%doc KEYS RELEASE-NOTES
 %attr(754,root,root) /etc/rc.d/init.d/tomcat
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/tomcat
 %{_sysconfdir}/tomcat
@@ -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