-# TODO:
-# - verify if java-commons-dbcp and java-commons-pool are really required
-# or build-required. (Note that java-commons-{dbcp,pool}-tomcat5 ARE
-# required).
# 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: Apache Servlet/JSP Engine, RI for Servlet %{servletapiver}/JSP %{jspapiver}API
-Summary(pl.UTF-8): Silnik Servlet/JSP Apache będący wzorcową implementacją API Servlet %{servletapiver}/JSP %{jspapiver}
+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: 5
+Version: 6.0.29
+Release: 3.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: 260de5ae62f415b9c085c5aeed4ef24c
Source1: apache-%{name}.init
Source2: apache-%{name}.sysconfig
Source3: %{name}-build.properties
Source14: %{name}-context-examples.xml
Patch0: %{name}-build.xml.patch
Patch1: %{name}-extras.xml.patch
+Patch2: server.xml-URIEncoding-utf8.patch
+Patch3: %{name}-LDAPUserDatabase.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 >= 0:1.1
BuildRequires: java-commons-dbcp-tomcat5 >= 0:1.1
-BuildRequires: java-commons-pool
BuildRequires: java-commons-pool-tomcat5
+BuildRequires: java-eclipse-jdt >= 3.2
%if %{with webservices}
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}-jasper = %{epoch}:%{version}-%{release}
-Requires: java-jdbc-mysql
-Requires: java-servletapi = %{epoch}:%{version}-%{release}
-Requires: java-commons-dbcp >= 0:1.1
+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
Requires: java-commons-pool-tomcat5
-Requires: java-sun-jre >= 1.2
-Requires: jaxp_parser_impl
-Requires: jndi >= 1.2.1
+Requires: java-jdbc-mysql
+Requires: java-mail
+Requires: java-servletapi = %{epoch}:%{version}-%{release}
+Requires: jpackage-utils
+Requires: jre >= 1.2
+Requires: jsvc
Requires: rc-scripts
+Suggests: tomcat-native
Provides: group(servlet)
Provides: group(tomcat)
Provides: user(tomcat)
%define _tomcatdir %{_datadir}/tomcat
%define _logdir %{_var}/log
%define _vardir %{_var}/lib/tomcat
-%define _sysconfdir /etc/tomcat
%define find_jar() %{expand:%%define jarfile {%(jar=$(find-jar %1); echo ${jar:-%%nil})}}%{?jarfile}%{!?jarfile:%{error:find-jar %1 failed}}%{nil}
%package webservices
Summary: Web Services support (JSR 109)
Group: Libraries/Java
+Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: java(JSR109)
Requires: java-geronimo-spec-jaxrpc
-Requires: %{name} = %{epoch}:%{version}-%{release}
%description webservices
Factories for JSR 109 which may be used to resolve web services
references.
-%package jasper
+%package -n java-tomcat-catalina
+Summary: Tomcat's servlet container
+Group: Libraries/Java
+Requires: jpackage-utils
+
+%description -n java-tomcat-catalina
+Catalina is Tomcat's servlet container. Catalina implements Sun
+Microsystems' specifications for servlet and JavaServer Pages (JSP).
+
+%package -n java-tomcat-coyote
+Summary: Tomcat HTTP connector
+Group: Libraries/Java
+Requires: jpackage-utils
+
+%description -n java-tomcat-coyote
+Coyote is Tomcat's HTTP Connector component that supports the HTTP 1.1
+protocol for the web server or application container. Coyote listens
+for incoming connections on a specific TCP port on the server and
+forwards the request to the Tomcat Engine to process the request and
+send back a response to the requesting client.
+
+%package -n java-tomcat-jasper
Summary: JSP compiler
Summary(pl.UTF-8): Kompilator JSP
Group: Libraries/Java
+Requires: java-eclipse-jdt >= 3.2
Requires: jpackage-utils
-Requires: eclipse-jdt >= 3.2
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: jakarta-servletapi5
Obsoletes: java-servletapi5
%description -n java-servletapi
%prep
%setup -q -n apache-%{name}-%{version}-src
-
%patch0 -p0
%patch1 -p0
+%patch2 -p1
+%patch3 -p1
# we don't need those scripts
rm bin/*.bat
rm bin/{startup,shutdown}.sh
-cp %{SOURCE3} build.properties
+cp -a %{SOURCE3} build.properties
%build
TOPDIR=$(pwd)
-%ant -Drpm.javadir=%{_javadir} -Drpm.libdir=%{_libdir}
+%ant \
+ -Drpm.javadir=%{_javadir} \
+ -Drpm.libdir=%{_libdir}
%if %{with javadoc}
%ant -f dist.xml dist-javadoc
%ant -f extras.xml webservices
%endif
-
%install
rm -rf $RPM_BUILD_ROOT
cd output/build
TOMCATDIR=$RPM_BUILD_ROOT%{_tomcatdir}
CATALINADIR=$RPM_BUILD_ROOT/var/lib/tomcat
+# useful for constructing relative symlinks. Is there a better way?
+TOMCATDIRREV=$(echo %{_tomcatdir} | sed 's#[^/]\+#..#g;s#^/##')
+CATALINADIRREV=$(echo /var/lib/tomcat | sed 's#[^/]\+#..#g;s#^/##')
+SYSCONFDIRREV=$(echo %{_sysconfdir} | sed 's#[^/]\+#..#g;s#^/##')
+
install -d $TOMCATDIR \
$CATALINADIR/temp \
$RPM_BUILD_ROOT%{_vardir}/webapps \
$RPM_BUILD_ROOT/etc/sysconfig \
$RPM_BUILD_ROOT/etc/rc.d/init.d
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/tomcat
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/tomcat
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/tomcat
+cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/tomcat
cp -a conf/* $CATALINADIR/conf
install -d $CATALINADIR/conf/Catalina/localhost
-install %{SOURCE10} $CATALINADIR/conf/Catalina/localhost/ROOT.xml
-install %{SOURCE11} $CATALINADIR/conf/Catalina/localhost/docs.xml
-install %{SOURCE12} $CATALINADIR/conf/Catalina/localhost/manager.xml
-install %{SOURCE13} $CATALINADIR/conf/Catalina/localhost/host-manager.xml
-install %{SOURCE14} $CATALINADIR/conf/Catalina/localhost/examples.xml
+cp -a %{SOURCE10} $CATALINADIR/conf/Catalina/localhost/ROOT.xml
+cp -a %{SOURCE11} $CATALINADIR/conf/Catalina/localhost/docs.xml
+cp -a %{SOURCE12} $CATALINADIR/conf/Catalina/localhost/manager.xml
+cp -a %{SOURCE13} $CATALINADIR/conf/Catalina/localhost/host-manager.xml
+cp -a %{SOURCE14} $CATALINADIR/conf/Catalina/localhost/examples.xml
cp -a bin lib webapps $TOMCATDIR
cp -a temp $CATALINADIR
-ln -sf %{_logdir}/tomcat $CATALINADIR/logs
-ln -sf %{_logdir}/tomcat $TOMCATDIR/logs
-ln -sf %{_vardir}/work $TOMCATDIR/work
-ln -sf %{_vardir}/conf $TOMCATDIR/conf
-ln -sf %{_vardir}/conf $RPM_BUILD_ROOT%{_sysconfdir}
+ln -sf $CATALINADIRREV%{_logdir}/tomcat $CATALINADIR/logs
+ln -sf $TOMCATDIRREV%{_logdir}/tomcat $TOMCATDIR/logs
+ln -sf $TOMCATDIRREV%{_vardir}/work $TOMCATDIR/work
+ln -sf $TOMCATDIRREV%{_vardir}/conf $TOMCATDIR/conf
+ln -sf $SYSCONFDIRREV%{_vardir}/conf $RPM_BUILD_ROOT%{_sysconfdir}/tomcat
# symlinks instead of copies
jars="commons-daemon commons-logging-api"
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
mv $TOMCATDIR/lib/jasper*.jar $RPM_BUILD_ROOT%{_javadir}
mv $TOMCATDIR/lib/jsp-api.jar $RPM_BUILD_ROOT%{_javadir}/jsp-api-%{jspapiver}.jar
mv $TOMCATDIR/lib/servlet-api.jar $RPM_BUILD_ROOT%{_javadir}/servlet-api-%{servletapiver}.jar
+mv $TOMCATDIR/lib/catalina.jar $RPM_BUILD_ROOT%{_javadir}/tomcat6-catalina.jar
+mv $TOMCATDIR/lib/tomcat-coyote.jar $RPM_BUILD_ROOT%{_javadir}/tomcat6-coyote.jar
ln -s jsp-api-%{jspapiver}.jar $RPM_BUILD_ROOT%{_javadir}/jsp-api.jar
ln -s servlet-api-%{servletapiver}.jar $RPM_BUILD_ROOT%{_javadir}/servlet-api.jar
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
%if %{with webservices}
install ../extras/catalina-ws.jar $TOMCATDIR/lib/catalina-ws.jar
%doc KEYS RELEASE-NOTES RELEASE-PLAN-6.0.txt RUNNING.txt
%attr(754,root,root) /etc/rc.d/init.d/tomcat
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/tomcat
-%{_sysconfdir}
+%{_sysconfdir}/tomcat
%dir %{_tomcatdir}
%dir %{_tomcatdir}/conf
%dir %{_tomcatdir}/bin
%{_tomcatdir}/lib/commons-dbcp-tomcat5.jar
%{_tomcatdir}/lib/commons-pool-tomcat5.jar
%{_tomcatdir}/lib/el-api.jar
-%{_tomcatdir}/lib/jsp-api-2.1.jar
+%{_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/servlet-api-2.5.jar
+%{_tomcatdir}/lib/org.eclipse.jdt.core.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
-%{_tomcatdir}/lib/jasper-el.jar
-%{_tomcatdir}/lib/jasper.jar
-%{_tomcatdir}/lib/org.eclipse.jdt.core.jar
+
+%files -n java-tomcat-catalina
+%defattr(644,root,root,755)
+%{_javadir}/tomcat6-catalina.jar
+
+%files -n java-tomcat-coyote
+%defattr(644,root,root,755)
+%{_javadir}/tomcat6-coyote.jar
%files -n java-servletapi
%defattr(644,root,root,755)
projects / packages / tomcat.git / blobdiff