X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=apache-tomcat.spec;h=4144f33f3d0e7dcb21b2289d6b2ae7805bf5c62b;hb=98717f4359cb2bf60e1494b28b008bdbffbb6d58;hp=f6c22dae1378f3d76a0492a0c6c72850c57cfa83;hpb=3cbc6002dddc26fa422abeb47b0b45de19b1a801;p=packages%2Fapache-tomcat.git diff --git a/apache-tomcat.spec b/apache-tomcat.spec index f6c22da..4144f33 100644 --- a/apache-tomcat.spec +++ b/apache-tomcat.spec @@ -2,7 +2,9 @@ # - packages for *.renametojar files (-cgi and -ssi in server/lib) # # Conditional build: -%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 @@ -29,6 +31,13 @@ Patch5: %{name}-dbcp.patch # this patch is needed for struts >= 1.3 Patch6: %{name}-struts.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 +# BuildRequires: jsse >= 0:1.0.3 +%endif BuildRequires: ant >= 1.5.3 BuildRequires: ant-trax BuildRequires: eclipse-jdt @@ -50,25 +59,23 @@ 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 +%{?with_jta:BuildRequires: java-jta >= 0:1.0.1} +BuildRequires: java-log4j +BuildRequires: java-puretls BuildRequires: java-servletapi5 = %{version} #BuildRequires: java-struts >= 0:1.2.7 BuildRequires: java-struts >= 1.0.2 +BuildRequires: java-xerces >= 0:2.7.1 +BuildRequires: java-xml-commons +#BuildRequires: java-xml-commons >= 1.3 BuildRequires: javamail >= 0:1.3.1 BuildRequires: jaxp_parser_impl >= 0:2.7.1 BuildRequires: jdbc-stdext >= 0:2.0 -BuildRequires: jdk >= 1.5 BuildRequires: jmx BuildRequires: jndi >= 0:1.2.1 BuildRequires: jpackage-utils -BuildRequires: jsse >= 0:1.0.3 -BuildRequires: jta >= 0:1.0.1 BuildRequires: junit >= 0:3.8.1 -BuildRequires: logging-log4j -BuildRequires: puretls BuildRequires: rpmbuild(macros) >= 1.300 -BuildRequires: xerces-j >= 0:2.7.1 -BuildRequires: xml-commons -#BuildRequires: xml-commons >= 1.3 Requires(post,postun): /sbin/ldconfig Requires(post,preun): /sbin/chkconfig Requires(postun): /usr/sbin/groupdel @@ -80,7 +87,6 @@ Requires(pre): /usr/sbin/useradd Requires: %{name}-jasper = %{version}-%{release} Requires: jaas #Requires: jaf >= 1.0.1 -Requires: jakarta-regexp #Requires: java-commons-beanutils #Requires: java-commons-collections #Requires: java-commons-dbcp-tomcat5 @@ -88,16 +94,17 @@ Requires: jakarta-regexp Requires: java-commons-el #Requires: java-commons-fileupload #Requires: java-commons-logging +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 +%{?with_jta:Requires: jta >= 1.0.1} Requires: rc-scripts -Requires: xml-commons Provides: group(tomcat) Provides: java-servlet-container Provides: user(tomcat) @@ -139,6 +146,17 @@ The Tomcat Servlet/JSP Container documentation. %description doc -l pl.UTF-8 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: Applications/WWW + +%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 @@ -202,6 +220,8 @@ cd - %endif # build tomcat 5.5 +# XXX build process should fail if one of these find-jar commands fails +# how to fix that? cat > build.properties <