X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=tomcat.spec;h=6c447071c311f40f355c7dd24e0d207a376af36e;hb=32e14b4a7f7d997ca09acebd77f13d3617f822c1;hp=5be5c22fa21251c475cf764e0ead3411fb05d3a1;hpb=c2e39bad3d80a6a935947f22dd8fff8004dd751f;p=packages%2Ftomcat.git diff --git a/tomcat.spec b/tomcat.spec index 5be5c22..6c44707 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -1,70 +1,96 @@ # # Conditional build: -%bcond_with binary # build from binary source -%bcond_without javadoc # skip building javadocs +%bcond_without javadoc # skip building javadocs +%bcond_with jta # put jta jar into tomcat lib dir. +%bcond_without java_sun # build with gcj (does not work) # Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API Summary(pl.UTF-8): Silnik Servlet/JSP Apache będący wzorcową implementacją API Servlet 2.4/JSP 2.0 -Name: apache-tomcat -Version: 5.5.23 -Release: 0.1 -License: Apache -Group: Development/Languages/Java -#Source0: http://www.apache.org/dist/tomcat/tomcat-5/v5.0.30/src/%{name}-%{version}-src.tar.gz -Source0: http://www.apache.org/dist/tomcat/tomcat-5/v%{version}/src/%{name}-%{version}-src.tar.gz -# Source0-md5: 362d1d8b15dc09882440dcab8c592dd7 -#Source0: http://apache.zone-h.org/ -Source1: jakarta-tomcat.init -Patch0: %{name}-skip-servletapi.patch -Patch1: %{name}-nsis.patch -Patch2: %{name}-native.patch -Patch3: %{name}-skip-jdt.patch -Patch4: %{name}-no-connectors.patch +Name: tomcat +Version: 5.5.27 +Release: 1 +License: Apache v2.0 +Group: Networking/Daemons/Java +Source0: http://www.apache.org/dist/tomcat/tomcat-5/v%{version}/src/apache-%{name}-%{version}-src.tar.gz +# Source0-md5: eb3f196013550b9b1684e4ff18593a8e +Source1: apache-%{name}.init +Source2: apache-%{name}.sysconfig +Source10: apache-%{name}-context-ROOT.xml +Source11: apache-%{name}-context-balancer.xml +Source12: apache-%{name}-context-jsp-examples.xml +Source13: apache-%{name}-context-tomcat-docs.xml +Source14: apache-%{name}-context-webdav.xml +Patch0: apache-%{name}-skip-servletapi.patch +Patch1: apache-%{name}-nsis.patch +Patch2: apache-%{name}-native.patch +Patch3: apache-%{name}-skip-jdt.patch +Patch4: apache-%{name}-no-connectors.patch +Patch5: apache-%{name}-dbcp.patch +Patch6: apache-%{name}-struts.patch +Patch7: apache-%{name}-admin-struts.patch +Patch8: apache-%{name}-no_links_to_examples.patch URL: http://tomcat.apache.org/ -# required: +# http://tomcat.apache.org/security-5.html +# Requires upgrade to 6.0.20 or (in future) 5.5.28. Or patch: +# http://svn.apache.org/viewvc?rev=781362&view=rev +BuildRequires: security(CVE-2009-0033) +# http://tomcat.apache.org/security-5.html +# Requires upgrade to 6.0.20 or (in future) 5.5.28. Or patch: +# http://svn.apache.org/viewvc?rev=781379&view=rev +BuildRequires: security(CVE-2009-0580) +# http://tomcat.apache.org/security-5.html +# Requires upgrade to 6.0.20 or (in future) 5.5.28. Or patches: +# http://svn.apache.org/viewvc?rev=781542&view=rev +# http://svn.apache.org/viewvc?rev=681156&view=rev +BuildRequires: security(CVE-2009-0783) +# http://tomcat.apache.org/security-5.html +# Requires upgrade to 6.0.20 or (in future) 5.5.28. Or patch: +# http://svn.apache.org/viewvc?rev=750928&view=rev +BuildRequires: security(CVE-2009-0781) +%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: jaas -BuildRequires: jakarta-commons-beanutils -BuildRequires: jakarta-commons-collections -BuildRequires: jakarta-commons-collections-source -BuildRequires: jakarta-commons-daemon -BuildRequires: jakarta-commons-dbcp -BuildRequires: jakarta-commons-dbcp-source -BuildRequires: jakarta-commons-digester -BuildRequires: jakarta-commons-fileupload -BuildRequires: jakarta-commons-httpclient -BuildRequires: jakarta-commons-launcher +BuildRequires: ant-trax BuildRequires: eclipse-jdt -BuildRequires: jakarta-commons-logging -BuildRequires: jakarta-commons-modeler >= 2.0 -BuildRequires: jakarta-commons-pool -BuildRequires: jakarta-commons-pool-source -BuildRequires: jakarta-regexp -BuildRequires: jakarta-servletapi5 -BuildRequires: jakarta-struts >= 1.0.2 -BuildRequires: jaxp_parser_impl -BuildRequires: jdk >= 1.5 +BuildRequires: jaas +BuildRequires: java-regexp >= 0:1.3 +BuildRequires: java-commons-beanutils >= 1.7 +BuildRequires: java-commons-chain +BuildRequires: java-commons-collections >= 0:3.1 +BuildRequires: java-commons-collections-tomcat5 >= 0:3.1 +BuildRequires: java-commons-daemon >= 1.0 +BuildRequires: java-commons-dbcp >= 0:1.2.1 +BuildRequires: java-commons-dbcp-tomcat5 >= 0:1.2.1 +BuildRequires: java-commons-digester >= 0:1.7 +BuildRequires: java-commons-el >= 0:1.0 +BuildRequires: java-commons-fileupload >= 0:1.0 +BuildRequires: java-commons-httpclient +BuildRequires: java-commons-io >= 1.4 +BuildRequires: java-commons-launcher >= 0:0.9 +BuildRequires: java-commons-logging >= 0:1.0.4 +BuildRequires: java-commons-modeler >= 2.0 +BuildRequires: java-commons-pool >= 0:1.2 +BuildRequires: java-commons-pool-tomcat5 >= 0:1.2 +BuildRequires: java-jdbc-mysql +%{?with_jta:BuildRequires: java-jta >= 0:1.0.1} +BuildRequires: java-log4j +BuildRequires: java-mail >= 0:1.3.1 +BuildRequires: java-puretls +BuildRequires: java-servletapi5 = %{version} +BuildRequires: java-struts >= 1.0.2 +BuildRequires: java-xerces >= 0:2.7.1 +BuildRequires: java-xml-commons +BuildRequires: jaxp_parser_impl >= 0:2.7.1 +BuildRequires: jdbc-stdext >= 0:2.0 +BuildRequires: jmx +BuildRequires: jndi >= 0:1.2.1 BuildRequires: jpackage-utils -BuildRequires: mx4j >= 1.1.1 -BuildRequires: puretls +BuildRequires: junit >= 0:3.8.1 BuildRequires: rpmbuild(macros) >= 1.300 -BuildRequires: xerces-j -%if %{with javadoc} -BuildRequires: jakarta-commons-el -%endif -# optional: -BuildRequires: jaf >= 1.0.1 -BuildRequires: jakarta-commons-dbcp -BuildRequires: jakarta-commons-pool -BuildRequires: javamail >= 1.2 -BuildRequires: jdbc-stdext >= 2.0 -BuildRequires: jndi >= 1.2.1 -BuildRequires: jsse >= 1.0.2 -BuildRequires: jta >= 1.0.1 -BuildRequires: junit >= 3.7 -BuildRequires: rpmbuild(macros) >= 1.268 -BuildRequires: tyrex >= 1.0 -BuildRequires: xml-commons Requires(post,postun): /sbin/ldconfig Requires(post,preun): /sbin/chkconfig Requires(postun): /usr/sbin/groupdel @@ -73,35 +99,42 @@ Requires(pre): /bin/id Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd +Requires: %{name}-jasper = %{version}-%{release} Requires: jaas -Requires: jaf >= 1.0.1 -Requires: jakarta-commons-beanutils -Requires: jakarta-commons-collections -Requires: jakarta-commons-digester -Requires: jakarta-commons-fileupload -Requires: jakarta-commons-logging -Requires: jakarta-regexp -Requires: jakarta-servletapi >= 4 +Requires: java-commons-beanutils +Requires: java-commons-collections +Requires: java-commons-digester +Requires: java-commons-el +Requires: java-commons-logging +Requires: java-commons-modeler +Requires: java-commons-pool-tomcat5 +Requires: java-jdbc-mysql +Requires: java-regexp +Requires: java-servletapi5 = %{version} +Requires: java-xml-commons Requires: javamail >= 1.2 Requires: jaxp_parser_impl Requires: jdbc-stdext >= 2.0 Requires: jndi >= 1.2.1 Requires: jre >= 1.2 Requires: jsse >= 1.0.2 -Requires: jta >= 1.0.1 -Requires: mx4j >= 1.1.1 +%{?with_jta:Requires: jta >= 1.0.1} Requires: rc-scripts -Requires: tyrex >= 1.0 -Requires: xml-commons -Provides: group(http) -Provides: user(http) +Provides: group(servlet) +Provides: group(tomcat) +Provides: java-servlet-container +Provides: user(tomcat) +Obsoletes: apache-tomcat Obsoletes: jakarta-tomcat BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _tomcatdir %{_libdir}/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} %description Tomcat is the servlet container that is used in the official Reference @@ -122,25 +155,68 @@ Community Process. %package doc Summary: The Apache Tomcat Servlet/JSP Container documentation -Summary(pl.UTF-8): Dokumentacja do Tomcata - kontekera Servlet/JSP -Group: Development/Languages/Java +Summary(pl.UTF-8): Dokumentacja do Tomcata - kontenera Servlet/JSP +Group: Documentation +Obsoletes: apache-tomcat-doc Obsoletes: jakarta-tomcat-doc %description doc The Tomcat Servlet/JSP Container documentation. %description doc -l pl.UTF-8 -Dokumentacja do Tomcata - kontekera Servlet/JSP. +Dokumentacja do Tomcata - kontenera Servlet/JSP. + +%package admin +Summary: Apache Tomcat`s Administration Web Application +Summary(pl.UTF-8): Panel Administracyjny dla Apache Tomcat +Group: Networking/Daemons/Java/Servlets +Requires: %{name} = %{version}-%{release} +Requires: java-commons-chain +Obsoletes: apache-tomcat-admin + +%description admin +Administration Web Application for Apache Tomcat. + +%description admin -l pl.UTF-8 +Panel Administracyjny dla Apache Tomcat. + +%package jasper +Summary: JSP compiler +Summary(pl.UTF-8): Kompilator JSP +Group: Libraries/Java +Requires: jpackage-utils +Obsoletes: apache-tomcat-jasper + +%description jasper +Jasper is Java ServerPages compiler used by Apache Tomcat servlet +container. + +%description jasper -l pl.UTF-8 +Jasper jest kompilatorem Java ServerPages używanym przez kontener +servletów Apache Tomcat. %prep -%setup -q -n %{name}-%{version}-src +%setup -q -n apache-%{name}-%{version}-src %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 + +# we don't need those scripts +rm -f container/catalina/src/bin/*.bat +rm -f container/catalina/src/bin/{startup,shutdown}.sh -# servletapi built from jakarta-servletapi5.spec +# causes file(1) rpm to abort, and not really neccessary file +# file: Thumbs.db: ERROR: Cannot read short stream (Invalid argument) +# rpm: error: magic_file(ms, "Thumbs.db") failed: mode 37777700644 Cannot read short stream (Invalid argument) +rm container/webapps/admin/images/Thumbs.db + +# servletapi built from java-servletapi5.spec rm -rf servletapi # Remove pre-built jars @@ -148,318 +224,139 @@ find -name '*.jar' | xargs rm -fv %build TOPDIR=$(pwd) -#xerces.jar=$(build-classpath xerces) -#jasper-compiler-jdt.jar=$(build-classpath jdtcore) - -mkdir -p tomcat-deps -> tomcat-deps/tomcat-dbcp.jar - -%if 0 -# build jasper javadocs -cd jasper -CLASSPATH=$(build-classpath xml-commons-apis) -cat > build.properties < build.properties < in build/build.xml -tomcat-dbcp.home= -commons-collections.home=%{_prefix}/src/jakarta-commons-collections-3.1 -commons-pool.home=%{_prefix}/src/jakarta-commons-pool-1.3 -commons-dbcp.home=%{_prefix}/src/jakarta-commons-dbcp-1.2.1 -tomcat-dbcp.home=$TOPDIR/tomcat-deps -# err, it compiles three above and then appends to the jar, so the file should exist -tomcat-dbcp.jar=$TOPDIR/tomcat-deps/tomcat-dbcp.jar - -%if 0 -ant.jar=%{_javadir}/ant.jar -ant-launcher.jar=%{_javadir}/ant-launcher.jar -jtc.home=$TOPDIR/jakarta-tomcat-connectors/ -jasper.home=$TOPDIR/jakarta-tomcat-jasper/jasper2 -commons-dbcp.jar=$(build-classpath commons-dbcp) -commons-pool.jar=$(build-classpath commons-pool) -jmxri.jar=$(build-classpath jre/jmx) -regexp.jar=$(build-classpath regexp) -jsp-api.jar=$TOPDIR/jakarta-servletapi-5/jsr152/dist/lib/jsp-api.jar -servlet.doc=$TOPDIR/jakarta-servletapi-5/jsr154/dist/docs/api -struts.lib=%{_datadir}/struts +commons-httpclient.jar=$(find-jar commons-httpclient) +commons-collections.jar=$(find-jar commons-collections) +commons-fileupload.jar=$(find-jar commons-fileupload) +commons-io.jar=$(find-jar commons-io) +jmx.jar=$(find-jar jmx) +jmx-tools.jar=$(find-jar jmx) +junit.jar=$(find-jar junit) +struts.jar=$(find-jar struts-core) +struts-core.jar=$(find-jar struts-core) +struts-taglib.jar=$(find-jar struts-taglib) +jcert.jar=$(find-jar jcert) +jnet.jar=$(find-jar jnet) +jsse.jar=$(find-jar jsse) +%{?with_jta:jta.jar=$(find-jar jta)} +puretls.jar=$(find-jar puretls) +servlet-api.jar=$(find-jar servlet-api) servletapi.build.notrequired=true -tyrex.jar=$(build-classpath tyrex) -jaas.jar=$(build-classpath jre/jaas) -jndi.jar=$(build-classpath jre/jndi) -jdbc20ext.jar=$(build-classpath jdbc-stdext) +jsp-api.jar=$(find-jar jsp-api) jspapi.build.notrequired=true -taglibs-core.jar=$(build-classpath taglibs-core) -taglibs-standard.jar=$(build-classpath taglibs-standard) -%endif - +log4j.jar=$(find-jar log4j) +tomcat-dbcp.jar=$(find-jar commons-dbcp-tomcat5) +struts.lib=%{_javadir}-struts EOF +if grep '=$' build.properties; then + : Some .jar could not be found + exit 1 +fi + %ant \ -Dcompile.source=1.4 -exit 1 - -# build the connectors -cd connectors - -%if 0 - -# this is just plain and simply evil but something changed in a major way between 5.0.16 and 5.0.18 -oldclasspath=$CLASSPATH -export CLASSPATH=$TOPDIR/jakarta-servletapi-5/jsr154/dist/lib/servlet-api.jar:\ -$TOPDIR/jakarta-tomcat-5/build/server/lib/catalina.jar -%endif - -%if 0 -cat > build.properties <