# Conditional build:
%bcond_without javadoc # skip building javadocs
+%bcond_without extras # skip building extras
%define jspapiver 2.2
%define servletapiver 3.0
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.63
+Version: 7.0.70
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: 29fbc490b99140a671e4c84d152caee7
+# Source0-md5: 0f56c888df5002cce25fce91634a65c9
Source1: apache-%{name}.init
Source2: apache-%{name}.sysconfig
Source3: %{name}-build.properties
Patch3: %{name}-catalina.policy-javadir.patch
Patch4: %{name}-userdir.patch
Patch5: logging.patch
-Patch6: jdt18.patch
+Patch6: jcl.patch
+Patch7: %{name}-build.patch
+Patch8: tomcat-CVE-2016-5388.patch
Patch100: jcl-build.xml.patch
URL: http://tomcat.apache.org/
BuildRequires: ant >= 1.5.3
BuildRequires: java-commons-daemon >= 1.0
BuildRequires: java-commons-dbcp-tomcat5 >= 0:1.1
BuildRequires: java-commons-pool-tomcat5
-BuildRequires: java-eclipse-jdt >= 4.3.2
+BuildRequires: java-eclipse-jdt >= 4.4.2
BuildRequires: java-geronimo-spec-jaxrpc
BuildRequires: java-jdbc-mysql
BuildRequires: java-junit
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p0
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
# Prepare java-commmons-logging sources
install -d output/extras/logging
# Base package
%ant
-# Extras
+%if %{with extras}
install -d output/extras/webservices
-
ln -sf %{_javadir}/geronimo-spec-jaxrpc.jar output/extras/webservices/jaxrpc.jar
ln -sf %{_javadir}/jsr109.jar output/extras/webservices/wsdl4j.jar
-
%ant extras
+%endif
# Javadoc
%if %{with javadoc}
ln -sf %{_javadir}/tomcat-coyote.jar $TOMCATDIR/lib/tomcat-coyote.jar
+%if %{with extras}
cp -a ../extras/catalina-ws.jar $TOMCATDIR/lib/catalina-ws.jar
cp -a ../extras/catalina-jmx-remote.jar $TOMCATDIR/lib/catalina-jmx-remote.jar
cp -a ../extras/tomcat-juli-adapters.jar $RPM_BUILD_ROOT%{_javadir}/tomcat-juli-adapters.jar
cp -a ../extras/tomcat-juli.jar $RPM_BUILD_ROOT%{_javadir}/tomcat-juli.jar
ln -sf %{_javadir}/tomcat-juli-adapters.jar $TOMCATDIR/lib/juli-adapters.jar
ln -sf %{_javadir}/tomcat-juli.jar $TOMCATDIR/lib/juli.jar
+%endif
ln -s %{_javadir}/geronimo-spec-jaxrpc.jar $TOMCATDIR/lib/jaxrpc.jar
ln -s %{_javadir}/jsr109.jar $TOMCATDIR/lib/jsr109.jar
%{_tomcatdir}/lib/jasper-el.jar
%{_tomcatdir}/lib/jasper.jar
%{_tomcatdir}/lib/jsp-api.jar
-%{_tomcatdir}/lib/juli-adapters.jar
-%{_tomcatdir}/lib/juli.jar
%{_tomcatdir}/lib/mail.jar
%{_tomcatdir}/lib/mysql-connector-java.jar
%{_tomcatdir}/lib/org.eclipse.jdt.core.jar
%{_tomcatdir}/lib/tomcat7-websocket.jar
%{_tomcatdir}/lib/websocket-api.jar
%{_tomcatdir}/lib/util.jar
+%if %{with extras}
+%{_tomcatdir}/lib/juli-adapters.jar
+%{_tomcatdir}/lib/juli.jar
+%endif
%dir %{_tomcatdir}/webapps
%files webservices
%defattr(644,root,root,755)
-%{_tomcatdir}/lib/catalina-ws.jar
%{_tomcatdir}/lib/jsr109.jar
%{_tomcatdir}/lib/jaxrpc.jar
+%if %{with extras}
+%{_tomcatdir}/lib/catalina-ws.jar
+%endif
+%if %{with extras}
%files jmx
%defattr(644,root,root,755)
%{_tomcatdir}/lib/catalina-jmx-remote.jar
+%endif
%files -n java-tomcat-jasper
%defattr(644,root,root,755)
%defattr(644,root,root,755)
%{_javadir}/tomcat-api.jar
%{_javadir}/tomcat-catalina.jar
+%{_javadir}/tomcat-util.jar
+%if %{with extras}
%{_javadir}/tomcat-juli-adapters.jar
%{_javadir}/tomcat-juli.jar
-%{_javadir}/tomcat-util.jar
+%endif
%files -n java-tomcat-coyote
%defattr(644,root,root,755)