- updated for tomcat 6.0.28

[packages/tomcat.git] / tomcat.spec

diff --git a/tomcat.spec b/tomcat.spec
index bade3acaf65158f62a28b51879bd59dbc847a555..f7d9893845d286b3ba2edf71d64cdae4c38f6b0d 100644 (file)
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -1,22 +1,21 @@
 
 # Conditional build:
 %bcond_without javadoc         # skip building javadocs
-%bcond_without java_sun        # build with gcj (does not work)
 %bcond_without webservices     # skip building webservices
 
 %define                jspapiver       2.1
 %define                servletapiver   2.5
 
 %include       /usr/lib/rpm/macros.java
-Summary:       Web server and Servlet/JSP Engine, RI for Servlet %{servletapiver}/JSP %{jspapiver}API
+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:       6.0.26
+Version:       6.0.28
 Release:       1
 License:       Apache v2.0
 Group:         Networking/Daemons/Java
 Source0:       http://www.apache.org/dist/tomcat/tomcat-6/v%{version}/src/apache-%{name}-%{version}-src.tar.gz
-# Source0-md5: 83b46d9346bcbc517dbf6f1cac9ef8b1
+# Source0-md5: fb36ed47cb358006a29e1a86037356df
 Source1:       apache-%{name}.init
 Source2:       apache-%{name}.sysconfig
 Source3:       %{name}-build.properties
@@ -28,12 +27,6 @@ Source14:    %{name}-context-examples.xml
 Patch0:                %{name}-build.xml.patch
 Patch1:                %{name}-extras.xml.patch
 URL:           http://tomcat.apache.org/
-%if %{with java_sun}
-BuildRequires: java-sun >= 1.5
-BuildRequires: java-sun-jre >= 1.5
-%else
-BuildRequires: java-gcj-compat-devel
-%endif
 BuildRequires: ant >= 1.5.3
 BuildRequires: ant-trax
 BuildRequires: eclipse-jdt >= 3.2
@@ -45,6 +38,8 @@ BuildRequires:        java(JSR109)
 BuildRequires: java-geronimo-spec-jaxrpc
 %endif
 BuildRequires: java-jdbc-mysql
+BuildRequires: java-mail
+BuildRequires: jdk
 BuildRequires: jpackage-utils
 BuildRequires: rpm-javaprov
 BuildRequires: rpmbuild(macros) >= 1.300
@@ -55,16 +50,19 @@ Requires(pre):      /bin/id
 Requires(pre): /usr/bin/getgid
 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-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-sun-jre >= 1.2
-Requires:      jaxp_parser_impl
-Requires:      jndi >= 1.2.1
+Requires:      jpackage-utils
+Requires:      jre >= 1.2
+Requires:      jsvc
 Requires:      rc-scripts
 Suggests:      tomcat-native
 Provides:      group(servlet)
@@ -203,8 +201,8 @@ servletów Apache Tomcat.
 Summary:       Java servlet and JSP implementation classes
 Summary(pl.UTF-8):     Klasy z implementacją Java Servlet i JSP
 Group:         Libraries/Java
-Provides:      java(JSP) = %{jspapiver}
-Provides:      java(Servlet) = %{servletapiver}
+Provides:      java(jsp) = %{jspapiver}
+Provides:      java(servlet) = %{servletapiver}
 Obsoletes:     java-servletapi5
 
 %description -n java-servletapi
@@ -290,7 +288,7 @@ for jar in $jars; do
        ln -sf $jar $TOMCATDIR/bin
 done
 
-jars="commons-pool-tomcat5 commons-dbcp-tomcat5 mysql-connector-java org.eclipse.jdt.core"
+jars="commons-pool-tomcat5 commons-dbcp-tomcat5 mysql-connector-java org.eclipse.jdt.core mail"
 for jar in $jars; do
        jar=$(find-jar $jar)
        ln -sf $jar $TOMCATDIR/lib
@@ -372,6 +370,7 @@ fi
 %{_tomcatdir}/lib/jasper-el.jar
 %{_tomcatdir}/lib/jasper.jar
 %{_tomcatdir}/lib/jsp-api.jar
+%{_tomcatdir}/lib/mail.jar
 %{_tomcatdir}/lib/mysql-connector-java.jar
 %{_tomcatdir}/lib/org.eclipse.jdt.core.jar
 %{_tomcatdir}/lib/servlet-api.jar