X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=tomcat.spec;h=0a50905eb285c7a8c3f39814281e05385bc9b919;hb=a798ef66d4f847aab7f623d6aeaab29f271e3848;hp=321380afbebf9ba0091abbdbc2f6eb40384c050f;hpb=5139e561c1ce7aa0901f828a2d8dc5eaf3a06f6c;p=packages%2Ftomcat.git diff --git a/tomcat.spec b/tomcat.spec index 321380a..0a50905 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -1,85 +1,57 @@ -# TODO -# - packages for *.renametojar files (-cgi and -ssi in server/lib) + # Conditional build: %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 + +%define jspapiver 2.2 +%define servletapiver 3.0 + +# Java Commons Logging version. Must be >= 1.1. +%define jclver 1.1.1 + +%include /usr/lib/rpm/macros.java +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: 5.5.27 -Release: 0.8 +Version: 7.0.40 +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 +Source0: http://www.apache.org/dist/tomcat/tomcat-7/v%{version}/src/apache-%{name}-%{version}-src.tar.gz +# Source0-md5: 158df72e6c046fa5d46a691a7c0805e6 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 -# this patch is needed for struts >= 1.3 -Patch6: apache-%{name}-struts.patch -# WTF? Why is it needed? Is it related to struts version? -Patch7: apache-%{name}-admin-struts.patch +Source3: %{name}-build.properties +Source10: %{name}-context-ROOT.xml +Source11: %{name}-context-docs.xml +Source12: %{name}-context-manager.xml +Source13: %{name}-context-host-manager.xml +Source14: %{name}-context-examples.xml +Source100: http://www.apache.org/dist/commons/logging/source/commons-logging-%{jclver}-src.tar.gz +# Source100-md5: e5cfa8cca13152d7545fde6b1783c60a +Patch0: %{name}-build.xml.patch +Patch1: server.xml-URIEncoding-utf8.patch +Patch2: %{name}-LDAPUserDatabase.patch +Patch3: %{name}-catalina.policy-javadir.patch +Patch4: %{name}-userdir.patch +Patch100: jcl-build.xml.patch URL: http://tomcat.apache.org/ -%if %{with java_sun} -BuildRequires: java-sun >= 1.5 -BuildRequires: java-sun-jre >= 1.5 -%else -# BuildRequires: jsse >= 0:1.0.3 -BuildRequires: java-gcj-compat-devel -%endif BuildRequires: ant >= 1.5.3 -BuildRequires: ant-trax -BuildRequires: eclipse-jdt -BuildRequires: jaas -BuildRequires: jakarta-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: eclipse-jdt >= 4.2.2 +BuildRequires: java(JSR109) +BuildRequires: java-avalon-logkit 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-commons-dbcp-tomcat5 >= 0:1.1 +BuildRequires: java-commons-pool-tomcat5 +BuildRequires: java-geronimo-spec-jaxrpc BuildRequires: java-jdbc-mysql -%{?with_jta:BuildRequires: java-jta >= 0:1.0.1} +BuildRequires: java-junit BuildRequires: java-log4j -BuildRequires: java-mail >= 0:1.3.1 -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: jaxp_parser_impl >= 0:2.7.1 -BuildRequires: jdbc-stdext >= 0:2.0 -BuildRequires: jmx -BuildRequires: jndi >= 0:1.2.1 +BuildRequires: java-mail +BuildRequires: jdk BuildRequires: jpackage-utils -BuildRequires: junit >= 0:3.8.1 -BuildRequires: rpmbuild(macros) >= 1.300 -Requires(post,postun): /sbin/ldconfig +BuildRequires: rpm-javaprov +BuildRequires: rpmbuild(macros) >= 1.553 +BuildRequires: sed >= 4.0 Requires(post,preun): /sbin/chkconfig Requires(postun): /usr/sbin/groupdel Requires(postun): /usr/sbin/userdel @@ -87,33 +59,23 @@ 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: java-commons-beanutils -Requires: java-commons-collections -#Requires: java-commons-dbcp-tomcat5 -Requires: java-commons-digester -Requires: java-commons-el -#Requires: java-commons-fileupload -Requires: java-commons-logging -Requires: java-commons-modeler +Requires: java(jaxp_parser_impl) +Requires: java(jndi) >= 1.2.1 +Requires: java-%{name}-catalina = %{version}-%{release} +Requires: java-%{name}-coyote = %{version}-%{release} +Requires: java-%{name}-jasper = %{version}-%{release} +Requires: java-commons-dbcp-tomcat5 >= 0:1.1 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: java-mail +Requires: java-servletapi = %{version}-%{release} +Requires: jpackage-utils Requires: jre >= 1.2 -Requires: jsse >= 1.0.2 -%{?with_jta:Requires: jta >= 1.0.1} +Requires: jsvc Requires: rc-scripts +Suggests: tomcat-native Provides: group(servlet) Provides: group(tomcat) -Provides: java-servlet-container Provides: user(tomcat) Obsoletes: apache-tomcat Obsoletes: jakarta-tomcat @@ -123,7 +85,6 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %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} @@ -136,7 +97,6 @@ Sun under the Java Community Process. Tomcat is developed in an open and participatory environment and released under the Apache Software License. Tomcat is intended to be a collaboration of the best-of-breed developers from around the world. -We invite you to participate in this open development project. %description -l pl.UTF-8 Tomcat to kontener serwletowy używany przez oficjalną implementację @@ -144,164 +104,243 @@ wzorcową technologii Java Servlet i JavaServer Pages. Specyfikacje Java Servlet i JavaServer Pages są rozwijane przez Suna zgodnie z Java Community Process. -%package doc +%package webapp-docs Summary: The Apache Tomcat Servlet/JSP Container documentation Summary(pl.UTF-8): Dokumentacja do Tomcata - kontenera Servlet/JSP Group: Documentation Obsoletes: apache-tomcat-doc Obsoletes: jakarta-tomcat-doc +Obsoletes: tomcat-doc -%description doc +%description webapp-docs The Tomcat Servlet/JSP Container documentation. -%description doc -l pl.UTF-8 +%description webapp-docs -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 +%package webapp-manager +Summary: The Apache Tomcat Servlet/JSP application manager +Summary(pl.UTF-8): Zarządca aplikacji w Tomcacie +Group: Networking/Daemons/Java/Servlets +Requires: %{name} = %{version}-%{release} + +%description webapp-manager +The Apache Tomcat Servlet/JSP application manager. + +%description webapp-manager -l pl.UTF-8 +Zarządca aplikacji w Tomcacie. + +%package webapp-host-manager +Summary: The Apache Tomcat Servlet/JSP virtual hosts manager +Summary(pl.UTF-8): Zarządca wirtualnych hostów w Tomcacie Group: Networking/Daemons/Java/Servlets Requires: %{name} = %{version}-%{release} -Requires: java-commons-chain +Obsoletes: tomcat-admin + +%description webapp-host-manager +The Apache Tomcat Servlet/JSP virtual hosts manager. + +%description webapp-host-manager -l pl.UTF-8 +Zarządca wirtualnych hostów w Tomcacie. + +%package webapp-examples +Summary: The Apache Tomcat Servlet/JSP example applications +Summary(pl.UTF-8): Przykładowe aplikacje dla Tomcata +Group: Networking/Daemons/Java/Servlets +Requires: %{name} = %{version}-%{release} + +%description webapp-examples +The Apache Tomcat Servlet/JSP example applications. + +%description webapp-examples -l pl.UTF-8 +Przykładowe aplikacje dla Tomcata. + +%package webservices +Summary: Web Services support (JSR 109) +Summary(pl.UTF-8): Wsparcie dla Web Services (JSR 109) +Group: Libraries/Java +Requires: %{name} = %{version}-%{release} +Requires: java(JSR109) +Requires: java-geronimo-spec-jaxrpc -%description admin -Administration Web Application for Apache Tomcat. +%description webservices +Factories for JSR 109 which may be used to resolve web services +references. -%description admin -l pl.UTF-8 -Panel Administracyjny dla Apache Tomcat. +%description webservices -l pl.UTF-8 +Wsparcie dla JSR 109 (Web Services). -%package jasper +%package jmx +Summary: JMX remote interface for Tomcat +Summary(pl.UTF-8): Zdalny interfejs JMX dla Tomcata +Group: Libraries/Java +Requires: %{name} = %{version}-%{release} + +%description jmx +JMX remote interface for Tomcat. + +%description jmx -l pl.UTF-8 +Zdalny interfejs JMX dla Tomcata. + +%package -n java-tomcat-catalina +Summary: Tomcat's servlet engine +Summary(pl.UTF-8): Silnik servletów dla Tomcata. +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). + +%description -n java-tomcat-catalina -l pl.UTF-8 +Bibliotek Javy zawierające silnik servletów i JSP tomcata. + +%package -n java-tomcat-coyote +Summary: Tomcat HTTP connector +Summary(pl.UTF-8): Interfejs HTTP dla Tomcata +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. + +%description -n java-tomcat-coyote -l pl.UTF-8 +Biblioteki Javy zawierające serwer HTTP 1.1 dla Tomcata. + +%package -n java-tomcat-jasper Summary: JSP compiler Summary(pl.UTF-8): Kompilator JSP Group: Libraries/Java +Requires: java-eclipse-jdt >= 4.2.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. +%package -n java-servletapi +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} +Obsoletes: jakarta-servletapi5 +Obsoletes: jakarta-servletapi5 +Obsoletes: java-servletapi5 + +%description -n java-servletapi +Implementation classes of the Java Servlet and JSP APIs (packages +javax.servlet, javax.servlet.http, javax.servlet.jsp, and +javax.servlet.jsp.tagext). + +%description -n java-servletapi -l pl.UTF-8 +Implementacje klas API Java Servlet i JSP (pakiety javax.servlet, +javax.servlet.http, javax.servlet.jsp i java.servlet.jsp.tagext). + %prep -%setup -q -n apache-%{name}-%{version}-src +%setup -q -a100 -n apache-%{name}-%{version}-src %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -# we don't need dos scripts -rm -f container/catalina/src/bin/*.bat -# or those -rm -f container/catalina/src/bin/{startup,shutdown}.sh +# Prepare java-commmons-logging sources +mkdir -p output/extras/logging +mv commons-logging-%{jclver}-src output/extras/logging +cd output/extras/logging/commons-logging-%{jclver}-src +%undos build.xml +%patch100 -p1 +cd - + +# we don't need those scripts +rm bin/*.bat +rm bin/{startup,shutdown}.sh + +cp -a %{SOURCE3} build.properties +cat >>build.properties < build.properties <