# 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.20
-Release: 6
+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: 44f49e7e14028b6a53c3c346bd18c72f
+# Source0-md5: fb36ed47cb358006a29e1a86037356df
Source1: apache-%{name}.init
Source2: apache-%{name}.sysconfig
Source3: %{name}-build.properties
Patch0: %{name}-build.xml.patch
Patch1: %{name}-extras.xml.patch
URL: http://tomcat.apache.org/
-BuildRequires: apr-devel
-BuildRequires: autoconf
-BuildRequires: libtool
-BuildRequires: openssl-devel
-%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
-BuildRequires: java-commons-collections >= 0:2.0
BuildRequires: java-commons-daemon >= 1.0
BuildRequires: java-commons-dbcp-tomcat5 >= 0:1.1
BuildRequires: java-commons-pool-tomcat5
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
Requires(post,preun): /sbin/chkconfig
Requires(postun): /usr/sbin/groupdel
Requires(pre): /usr/bin/getgid
Requires(pre): /usr/sbin/groupadd
Requires(pre): /usr/sbin/useradd
-Requires: %{name}-catalina = %{epoch}:%{version}-%{release}
-Requires: %{name}-coyote = %{epoch}:%{version}-%{release}
-Requires: %{name}-jasper = %{epoch}:%{version}-%{release}
+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)
forwards the request to the Tomcat Engine to process the request and
send back a response to the requesting client.
-%package jasper
+%package -n java-tomcat-jasper
Summary: JSP compiler
Summary(pl.UTF-8): Kompilator JSP
Group: Libraries/Java
Requires: eclipse-jdt >= 3.2
Requires: jpackage-utils
Obsoletes: apache-tomcat-jasper
+Obsoletes: tomcat-jasper
-%description jasper
+%description -n java-tomcat-jasper
Jasper is Java ServerPages compiler used by Apache Tomcat servlet
container.
-%description jasper -l pl.UTF-8
+%description -n java-tomcat-jasper -l pl.UTF-8
Jasper jest kompilatorem Java ServerPages używanym przez kontener
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
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
ln -sf %{_javadir}/jasper-el.jar $TOMCATDIR/lib
ln -sf %{_javadir}/jasper.jar $TOMCATDIR/lib
-ln -sf %{_javadir}/jsp-api-%{jspapiver}.jar $TOMCATDIR/lib
-ln -sf %{_javadir}/servlet-api-%{servletapiver}.jar $TOMCATDIR/lib
+ln -sf %{_javadir}/jsp-api-%{jspapiver}.jar $TOMCATDIR/lib/jsp-api.jar
+ln -sf %{_javadir}/servlet-api-%{servletapiver}.jar $TOMCATDIR/lib/servlet-api.jar
ln -sf %{_javadir}/tomcat6-catalina.jar $TOMCATDIR/lib/catalina.jar
ln -sf %{_javadir}/tomcat6-coyote.jar $TOMCATDIR/lib/tomcat-coyote.jar
%{_tomcatdir}/lib/el-api.jar
%{_tomcatdir}/lib/jasper-el.jar
%{_tomcatdir}/lib/jasper.jar
-%{_tomcatdir}/lib/jsp-api-2.1.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-2.5.jar
+%{_tomcatdir}/lib/servlet-api.jar
%{_tomcatdir}/lib/tomcat-coyote.jar
%{_tomcatdir}/lib/tomcat-i18n-es.jar
%{_tomcatdir}/lib/tomcat-i18n-fr.jar
%{_tomcatdir}/lib/jaxrpc.jar
%endif
-%files jasper
+%files -n java-tomcat-jasper
%defattr(644,root,root,755)
%{_javadir}/jasper-el.jar
%{_javadir}/jasper.jar
projects / packages / tomcat.git / blobdiff