X-Git-Url: http://git.pld-linux.org/?p=packages%2Ftomcat.git;a=blobdiff_plain;f=tomcat.spec;h=90462a5b996fd1a64d5f84931f037d39ff549fd1;hp=a05cbbdb656a38fb4e98c468ded0f974ea037e0e;hb=0f154dd6f3029292b4ca0a1d7fdaea666bfa8176;hpb=df85b7fd9eb0cba44e284913992324db17aa7da2 diff --git a/tomcat.spec b/tomcat.spec index a05cbbd..90462a5 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -1,22 +1,23 @@ # 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 +%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: 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: 6 +Version: 7.0.12 +Release: 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: http://www.apache.org/dist/tomcat/tomcat-7/v%{version}/src/apache-%{name}-%{version}-src.tar.gz +# Source0-md5: edfd253c21b51ccadce8ec05be5e61fb Source1: apache-%{name}.init Source2: apache-%{name}.sysconfig Source3: %{name}-build.properties @@ -25,32 +26,33 @@ 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: %{name}-extras.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/ -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(JSR109) +BuildRequires: java-avalon-logkit BuildRequires: java-commons-daemon >= 1.0 BuildRequires: java-commons-dbcp-tomcat5 >= 0:1.1 BuildRequires: java-commons-pool-tomcat5 -%if %{with webservices} -BuildRequires: java(JSR109) BuildRequires: java-geronimo-spec-jaxrpc -%endif +BuildRequires: java-jdbc-mysql +BuildRequires: java-junit +BuildRequires: java-log4j +BuildRequires: java-mail +BuildRequires: jdk BuildRequires: jpackage-utils -BuildRequires: rpmbuild(macros) >= 1.300 +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 @@ -58,16 +60,19 @@ Requires(pre): /bin/id Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd -Requires: %{name}-catalina = %{epoch}:%{version}-%{release} -Requires: %{name}-coyote = %{epoch}:%{version}-%{release} -Requires: %{name}-jasper = %{epoch}:%{version}-%{release} +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-tomcat5 Requires: java-jdbc-mysql +Requires: java-mail Requires: java-servletapi = %{epoch}:%{version}-%{release} -Requires: java-sun-jre >= 1.2 -Requires: jaxp_parser_impl -Requires: jndi >= 1.2.1 +Requires: jpackage-utils +Requires: jre >= 1.2 +Requires: jsvc Requires: rc-scripts Suggests: tomcat-native Provides: group(servlet) @@ -81,7 +86,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} @@ -94,7 +98,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ę @@ -155,6 +158,7 @@ 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} = %{epoch}:%{version}-%{release} Requires: java(JSR109) @@ -164,8 +168,24 @@ Requires: java-geronimo-spec-jaxrpc Factories for JSR 109 which may be used to resolve web services references. +%description webservices -l pl.UTF-8 +Wsparcie dla JSR 109 (Web Services). + +%package jmx +Summary: JMX remote interface for Tomcat +Summary(pl.UTF-8): Zdalny interfejs JMX dla Tomcata +Group: Libraries/Java +Requires: %{name} = %{epoch}:%{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 container +Summary: Tomcat's servlet engine +Summary(pl.UTF-8): Silnik servletów dla Tomcata. Group: Libraries/Java Requires: jpackage-utils @@ -173,8 +193,12 @@ Requires: jpackage-utils 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 @@ -185,19 +209,23 @@ 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 jasper +%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: eclipse-jdt >= 3.2 +Requires: java-eclipse-jdt >= 3.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. @@ -205,9 +233,11 @@ 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 +Obsoletes: jakarta-servletapi5 %description -n java-servletapi Implementation classes of the Java Servlet and JSP APIs (packages @@ -219,35 +249,57 @@ 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 - -%patch0 -p0 -%patch1 -p0 +%setup -q -a100 -n apache-%{name}-%{version}-src +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 + +# 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 %{SOURCE3} build.properties +cp -a %{SOURCE3} build.properties +cat >>build.properties <