- copy from tomcat5 branch, previous one saved to TOMCAT-4_1 branch

- version 5.5.23

Changed files:
    apache-tomcat.spec -> 1.42

diff --git a/apache-tomcat.spec b/apache-tomcat.spec
index f3e579a249b6a46c3f459d86c761dc9bd24491fa..31ba2a1b040d9f0838e9516b400eae4e0e4b8ad3 100644 (file)
--- a/apache-tomcat.spec
+++ b/apache-tomcat.spec
@@ -1,19 +1,19 @@
-%define                base_version 4.0
-Summary:       The Tomcat Servlet/JSP Container
-Summary(pl.UTF-8):     Tomcat - Zasobnik servletów/JSP
+# Conditional build:
+%bcond_with    binary  # build from binary source
+%bcond_without javadoc # skip building javadocs
+#
+Summary:       Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
+Summary(pl):   Tomcat - Zasobnik servletów/JSP
 Name:          jakarta-tomcat
-Version:       4.1.24
-Release:       4
+Version:       5.5.23
+Release:       0.1
 License:       Apache
 Group:         Development/Languages/Java
-Source0:       http://jakarta.apache.org/builds/jakarta-tomcat-%{base_version}/release/v%{version}/src/%{name}-%{version}-src.tar.gz
-# Source0-md5: bdcdf1091ff942f378b1e6f402e44a67
-Source1:       http://jakarta.apache.org/builds/jakarta-tomcat-%{base_version}/release/v%{version}/src/%{name}-connectors-%{version}-src.tar.gz
-# Source1-md5: 0daa701e51d04570006abce1ac580aed
-Source2:       %{name}.init
-Patch0:                %{name}-fixes.patch
-Patch1:                %{name}-JAVA_HOME.patch
-Patch2:                %{name}-fileupload.patch
+#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/apache-tomcat-%{version}-src.tar.gz
+# Source0-md5: 362d1d8b15dc09882440dcab8c592dd7
+#Source0:      http://apache.zone-h.org/
+Source1:       %{name}.init
 URL:           http://tomcat.apache.org/
 # required:
 BuildRequires: ant >= 1.5.3
@@ -32,6 +32,7 @@ BuildRequires:        jpackage-utils
 BuildRequires: mx4j >= 1.1.1
 BuildRequires: puretls
 BuildRequires: rpmbuild(macros) >= 1.300
+BuildRequires: xerces-j
 # optional:
 BuildRequires: jaf >= 1.0.1
 BuildRequires: jakarta-commons-daemon
@@ -44,6 +45,7 @@ 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
@@ -71,6 +73,7 @@ Requires:     jre >= 1.2
 Requires:      jsse >= 1.0.2
 Requires:      jta >= 1.0.1
 Requires:      mx4j >= 1.1.1
+Requires:      rc-scripts
 Requires:      tyrex >= 1.0
 Requires:      xml-commons
 Provides:      group(http)
@@ -78,85 +81,169 @@ Provides:  user(http)
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _javalibdir     %{_datadir}/java
 %define                _tomcatdir      %{_libdir}/tomcat
 %define        _logdir         %{_var}/log
 %define                _vardir         %{_var}/lib/tomcat
 
 %description
-Tomcat 4.0, a server that implements the Servlet 2.3 and JSP 1.2
-Specifications from Java Software.
+Tomcat is the servlet container that is used in the official Reference
+Implementation for the Java Servlet and JavaServer Pages technologies.
+The Java Servlet and JavaServer Pages specifications are developed by
+Sun under the Java Community Process.
 
-%description -l pl.UTF-8
-Tomcat 4.0 - serwer implementujący specyfikacje Servlet 2.3 oraz JSP
+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
+Tomcat 4.0 - serwer implementuj±cy specyfikacje Servlet 2.3 oraz JSP
 1.2.
 
 %package doc
 Summary:       The Tomcat Servlet/JSP Container documentation
-Summary(pl.UTF-8):     Dokumentacja do Tomcata
+Summary(pl):   Dokumentacja do Tomcata
 Group:         Development/Languages/Java
 
 %description doc
 The Tomcat Servlet/JSP Container documentation.
 
-%description doc -l pl.UTF-8
+%description doc -l pl
 Dokumentacja do Tomcata.
 
 %prep
-%setup -q -n %{name}-%{version}-src -a1
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%setup -q -n apache-tomcat-%{version}-src/
+
+# Remove pre-built jars
+find -name '*.jar' | xargs rm -fv
 
 %build
-CLASSPATH=%{_javalibdir}/xml-commons-apis.jar
-CLASSPATH=$CLASSPATH:%{_javalibdir}/xalan.jar
-CLASSPATH=$CLASSPATH:%{_javalibdir}/servlet.jar
-export CLASSPATH
-
-rm -f lib/*.jar
-rm -f %{name}-connectors-%{version}-src/lib/*.jar
-
-cat >> build.properties <<EOBP
-ant.jar=%{_javalibdir}/ant.jar
-jtc.home=$RPM_BUILD_DIR/%{name}-%{version}-src/%{name}-connectors-%{version}-src/
-jasper.home=./jasper
-commons-beanutils.jar=%{_javalibdir}/commons-beanutils.jar
-commons-fileupload.jar=%{_javalibdir}/commons-fileupload.jar
-commons-collections.jar=%{_javalibdir}/commons-collections.jar
-commons-daemon.jar=%{_javalibdir}/commons-daemon.jar
-commons-dbcp.jar=%{_javalibdir}/commons-dbcp.jar
-commons-digester.jar=%{_javalibdir}/commons-digester.jar
-commons-logging.jar=%{_javalibdir}/commons-logging.jar
-commons-logging-api.jar=%{_javalibdir}/commons-logging-api.jar
-commons-modeler.jar=%{_javalibdir}/commons-modeler.jar
-commons-pool.jar=%{_javalibdir}/commons-pool.jar
-jcert.jar=%{_javalibdir}/jcert.jar
-jnet.jar=%{_javalibdir}/jnet.jar
-jsse.jar=%{_javalibdir}/jsse.jar
-jmx.jar=%{_javalibdir}/mx4j-jmx.jar
-jmxri.jar=%{_javalibdir}/mx4j-jmx.jar
-junit.jar=%{_javalibdir}/junit.jar
-regexp.jar=%{_javalibdir}/regexp.jar
-servlet.jar=%{_javalibdir}/servlet.jar
-#servlet.doc=%{javadocdir}/servletapi4
-xercesImpl.jar=%{_javalibdir}/jaxp_parser_impl.jar
-xmlParserAPIs.jar=%{_javalibdir}/xml-commons-apis.jar
-puretls.jar=%{_javalibdir}/puretls.jar
-jmx.jar=%{_javalibdir}/mx4j-jmx.jar
-struts.jar=%{_javalibdir}/struts.jar
-struts.lib=%{_datadir}/jakarta-struts
-jdbc20ext.jar=%{_javalibdir}/jdbc-stdext.jar
-activation.jar=%{_javalibdir}/activation.jar
-mail.jar=%{_javalibdir}/mailapi.jar
-jndi.jar=%{_javalibdir}/jndi.jar
-jta.jar=%{_javalibdir}/jta.jar
-jaas.jar=%{_javalibdir}/jaas.jar
-tyrex.jar=%{_javalibdir}/tyrex.jar
+TOPDIR=$(pwd)
+
+# build jsp-api, servlet-api as ant dist will later on require them for webapps
+cd servletapi/jsr154
+%ant -Dservletapi.build=build -Dservletapi.dist=dist -Dbuild.compiler=modern dist
+
+cd ../jsr152
+%ant -Dservletapi.build=build -Dservletapi.dist=dist -Dbuild.compiler=modern dist
+
+# build jasper subpackage
+cd ../../jasper
+CLASSPATH=$(build-classpath xml-commons-apis xalan)
+export CLASSPATH=$CLASSPATH:$TOPDIR/servletapi/jsr154/dist/lib/servlet-api.jar
+cat > build.properties <<EOF
+ant.jar=$(build-classpath ant)
+servlet-api.jar=$TOPDIR/servletapi/jsr154/dist/lib/servlet-api.jar
+jsp-api.jar=$TOPDIR/servletapi/jsr152/dist/lib/jsp-api.jar
+tools.jar=%{java_home}/lib/tools.jar
+xerces.jar=$(build-classpath xerces)
+xercesImpl.jar=$(build-classpath jaxp_parser_impl)
+xmlParserAPIs.jar=$(build-classpath xml-commons-apis)
+commons-el.jar=$(build-classpath commons-el)
+commons-collections.jar=$(build-classpath commons-collections)
+commons-logging.jar=$(build-classpath commons-logging)
+commons-daemon.jar=$(build-classpath commons-daemon)
+junit.jar=$(build-classpath junit)
+jasper-compiler-jdt.jar=$(build-classpath jdtcore)
+EOF
+%ant -Dbuild.compiler=modern javadoc
+
+# build tomcat 5.5
+cd ../build
+cat >> build.properties <<EOF
+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-beanutils.jar=$(build-classpath commons-beanutils)
+commons-fileupload.jar=$(build-classpath commons-fileupload)
+commons-collections.jar=$(build-classpath commons-collections)
+commons-dbcp.jar=$(build-classpath commons-dbcp)
+commons-digester.jar=$(build-classpath commons-digester)
+commons-el.jar=$(build-classpath commons-el)
+commons-launcher.jar=$(build-classpath commons-launcher)
+commons-logging.jar=$(build-classpath commons-logging)
+commons-logging-api.jar=$(build-classpath commons-logging-api)
+commons-modeler.jar=$(build-classpath commons-modeler)
+commons-pool.jar=$(build-classpath commons-pool)
+jmx.jar=$(build-classpath jre/jmx)
+jmx-tools.jar=$(build-classpath jre/jmx)
+jmxri.jar=$(build-classpath jre/jmx)
+junit.jar=$(build-classpath junit)
+regexp.jar=$(build-classpath regexp)
+servlet-api.jar=$TOPDIR/jakarta-servletapi-5/jsr154/dist/lib/servlet-api.jar
+jsp-api.jar=$TOPDIR/jakarta-servletapi-5/jsr152/dist/lib/jsp-api.jar
+servlet.doc=$TOPDIR/jakarta-servletapi-5/jsr154/dist/docs/api
+xercesImpl.jar=$(build-classpath jaxp_parser_impl)
+xml-apis.jar=$(build-classpath xml-commons-apis)
+struts.jar=$(build-classpath struts)
+struts.lib=%{_datadir}/struts
+activation.jar=$(build-classpath jaf)
+mail.jar=$(build-classpath javamail/mailapi)
+jta.jar=$(build-classpath jta)
+tyrex.jar=$(build-classpath tyrex)
+jaas.jar=$(build-classpath jre/jaas)
+jndi.jar=$(build-classpath jre/jndi)
+jdbc20ext.jar=$(build-classpath jdbc-stdext)
+puretls.jar=$(build-classpath puretls)
+jcert.jar=$(build-classpath java/jcert)
+jnet.jar=$(build-classpath java/jnet)
+jsse.jar=$(build-classpath java/jsse)
+servletapi.build.notrequired=true
+jspapi.build.notrequired=true
+taglibs-core.jar=$(build-classpath taglibs-core)
+taglibs-standard.jar=$(build-classpath taglibs-standard)
+EOF
+
+%ant build
+
+exit 1
+
+%if 0
+# build tomcat 5
+
+# build the connectors
+cd ../jakarta-tomcat-connectors
+
+# 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
+
+cat > build.properties <<EOBP
+activation.jar=$(build-classpath jaf)
+ant.jar=%{_javadir}/ant.jar
+junit.jar=$(build-classpath junit)
+commons-beanutils.jar=$(build-classpath commons-beanutils)
+commons-collections.jar=$(build-classpath commons-collections)
+commons-digester.jar=$(build-classpath commons-digester)
+commons-fileupload.jar=$(build-classpath commons-fileupload)
+commons-logging.jar=$(build-classpath commons-logging)
+commons-logging-api.jar=$(build-classpath commons-logging-api)
+commons-modeler.jar=$(build-classpath commons-modeler)
+commons-pool.jar=$(build-classpath commons-pool)
+regexp.jar=$(build-classpath regexp)
+jmx.jar=$(build-classpath mx4j/mx4j)
+puretls=$(build-classpath puretls)
+activation.jar=$(build-classpath jaf)
+mail.jar=$(build-classpath javamail/mailapi)
+jta.jar=$(build-classpath jta)
+tyrex.jar=$(build-classpath tyrex)
+jaas.jar=$(build-classpath jaas)
+jndi.jar=$(build-classpath jndi)
+jdbc20ext.jar=$(build-classpath java/jdbc-stdext)
+puretls.jar=$(build-classpath puretls)
+jcert.jar=$(build-classpath jsse/jcert)
+jnet.jar=$(build-classpath jsse/jnet)
+jsse.jar=$(build-classpath jsse/jsse)
 EOBP
+%ant -Dbuild.compiler=modern -Djava.home=%{java_home} build
+export CLASSPATH=$oldclasspath
 
-JAVA_HOME=%{_libdir}/java
-ant -Djava.home=$JAVA_HOME
+# build the webapps and make the tree ready to install
+cd ../jakarta-tomcat-5
+%ant -Dbuild.compiler=modern -Djava.home=%{java_home} dist
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -193,49 +280,49 @@ ln -sf %{_vardir}/work            $DEST/work
 ln -sf %{_sysconfdir}/tomcat   $DEST/conf
 
 # symlinks instead of copies
-ln -sf %{_javalibdir}/commons-daemon.jar       $DEST/bin
-
-ln -sf %{_javalibdir}/activation.jar           $DEST/common/lib
-ln -sf %{_javalibdir}/ant.jar                  $DEST/common/lib
-ln -sf %{_javalibdir}/commons-collections.jar  $DEST/common/lib
-ln -sf %{_javalibdir}/commons-dbcp.jar         $DEST/common/lib
-ln -sf %{_javalibdir}/commons-logging-api.jar  $DEST/common/lib
-ln -sf %{_javalibdir}/commons-pool.jar         $DEST/common/lib
-ln -sf %{_javalibdir}/servlet.jar              $DEST/common/lib
-ln -sf %{_javalibdir}/servlet.jar              $DEST/common/lib/servletapi4.jar
-ln -sf %{_javalibdir}/jdbc-stdext.jar          $DEST/common/lib/jdbc2_0-stdext.jar
-ln -sf %{_javalibdir}/jdbc-stdext.jar          $DEST/common/lib/jdbc-stdext-2.0.jar
-ln -sf %{_javalibdir}/jmxri.jar                        $DEST/common/lib
-ln -sf %{_javalibdir}/jndi.jar                 $DEST/common/lib
-ln -sf %{_javalibdir}/jta.jar                  $DEST/common/lib
-ln -sf %{_javalibdir}/mail.jar                 $DEST/common/lib
-ln -sf %{_javalibdir}/jsse.jar                 $DEST/common/lib
-ln -sf %{_javalibdir}/tyrex.jar                        $DEST/common/lib
-ln -sf %{_javalibdir}/junit.jar                        $DEST/common/lib
-
-ln -sf %{_javalibdir}/mailapi.jar              $DEST/common/lib
-ln -sf %{_javalibdir}/pop3.jar                 $DEST/common/lib
-ln -sf %{_javalibdir}/pop3.jar                 $DEST/common/lib/pop.jar
-ln -sf %{_javalibdir}/smtp.jar                 $DEST/common/lib
-ln -sf %{_javalibdir}/imap.jar                 $DEST/common/lib
-
-ln -sf %{_javalibdir}/commons-beanutils.jar    $DEST/server/lib
-ln -sf %{_javalibdir}/commons-digester.jar     $DEST/server/lib
-ln -sf %{_javalibdir}/commons-fileupload.jar   $DEST/server/lib
-ln -sf %{_javalibdir}/commons-logging.jar      $DEST/server/lib
-ln -sf %{_javalibdir}/commons-modeler.jar      $DEST/server/lib
-ln -sf %{_javalibdir}/jaas.jar                 $DEST/server/lib/jaas.jar
-ln -sf %{_javalibdir}/mx4j-jmx.jar             $DEST/server/lib
-ln -sf %{_javalibdir}/regexp.jar               $DEST/server/lib
-ln -sf %{_javalibdir}/regexp.jar               $DEST/server/lib/jakarta-regexp-1.2.jar
-ln -sf %{_javalibdir}/regexp.jar               $DEST/server/lib/regexp-1.2.jar
-
-ln -sf %{_javalibdir}/jaxp_parser_impl.jar     $DEST/common/endorsed
-ln -sf %{_javalibdir}/xml-commons-apis.jar     $DEST/common/endorsed
-
-ln -sf %{_javalibdir}/struts.jar $DEST/server/webapps/admin/WEB-INF/lib
-
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/tomcat
+ln -sf %{_javadir}/commons-daemon.jar  $DEST/bin
+
+ln -sf %{_javadir}/activation.jar              $DEST/common/lib
+ln -sf %{_javadir}/ant.jar                     $DEST/common/lib
+ln -sf %{_javadir}/commons-collections.jar     $DEST/common/lib
+ln -sf %{_javadir}/commons-dbcp.jar            $DEST/common/lib
+ln -sf %{_javadir}/commons-logging-api.jar     $DEST/common/lib
+ln -sf %{_javadir}/commons-pool.jar            $DEST/common/lib
+ln -sf %{_javadir}/servlet.jar         $DEST/common/lib
+ln -sf %{_javadir}/servlet.jar         $DEST/common/lib/servletapi4.jar
+ln -sf %{_javadir}/jdbc-stdext.jar             $DEST/common/lib/jdbc2_0-stdext.jar
+ln -sf %{_javadir}/jdbc-stdext.jar             $DEST/common/lib/jdbc-stdext-2.0.jar
+ln -sf %{_javadir}/jmxri.jar                   $DEST/common/lib
+ln -sf %{_javadir}/jndi.jar                    $DEST/common/lib
+ln -sf %{_javadir}/jta.jar                     $DEST/common/lib
+ln -sf %{_javadir}/mail.jar                    $DEST/common/lib
+ln -sf %{_javadir}/jsse.jar                    $DEST/common/lib
+ln -sf %{_javadir}/tyrex.jar                   $DEST/common/lib
+ln -sf %{_javadir}/junit.jar                   $DEST/common/lib
+
+ln -sf %{_javadir}/mailapi.jar         $DEST/common/lib
+ln -sf %{_javadir}/pop3.jar                    $DEST/common/lib
+ln -sf %{_javadir}/pop3.jar                    $DEST/common/lib/pop.jar
+ln -sf %{_javadir}/smtp.jar                    $DEST/common/lib
+ln -sf %{_javadir}/imap.jar                    $DEST/common/lib
+
+ln -sf %{_javadir}/commons-beanutils.jar       $DEST/server/lib
+ln -sf %{_javadir}/commons-digester.jar        $DEST/server/lib
+ln -sf %{_javadir}/commons-fileupload.jar      $DEST/server/lib
+ln -sf %{_javadir}/commons-logging.jar $DEST/server/lib
+ln -sf %{_javadir}/commons-modeler.jar $DEST/server/lib
+ln -sf %{_javadir}/jaas.jar                    $DEST/server/lib/jaas.jar
+ln -sf %{_javadir}/mx4j-jmx.jar                $DEST/server/lib
+ln -sf %{_javadir}/regexp.jar          $DEST/server/lib
+ln -sf %{_javadir}/regexp.jar          $DEST/server/lib/jakarta-regexp-1.2.jar
+ln -sf %{_javadir}/regexp.jar          $DEST/server/lib/regexp-1.2.jar
+
+ln -sf %{_javadir}/jaxp_parser_impl.jar        $DEST/common/endorsed
+ln -sf %{_javadir}/xml-commons-apis.jar        $DEST/common/endorsed
+
+ln -sf %{_javadir}/struts.jar $DEST/server/webapps/admin/WEB-INF/lib
+
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/tomcat
 
 %clean
 rm -rf $RPM_BUILD_ROOT