[prev in list] [next in list] [prev in thread] [next in thread]
List: jpackage-discuss
Subject: Re: [JPackage-discuss] [JPackage-announce]
From: <R.Apel () t-systems ! com>
Date: 2008-06-19 14:09:51
Message-ID: 44D7FF08C0F1C047B611DAD72B180E7501CD3E3D () S4DE8PSAABE ! t-systems ! com
[Download RAW message or body]
And there is still another aspect:
tomcat6 isn't just a higher version of the container, but the implementation of a \
different spec.
-----Ursprüngliche Nachricht-----
Von: jpackage-discuss-bounces@zarb.org [mailto:jpackage-discuss-bounces@zarb.org] Im \
Auftrag von Jason Corley
Gesendet: Donnerstag, 19. Juni 2008 15:57
An: Discussion about JPackage project
Betreff: Re: [JPackage-discuss] [JPackage-announce] [RPM(5.0)]tomcat5-5.5.26-1jpp
Are there packages in the repo right now that specifically require
tomcat 5? I thought they were all servlet.jar type requirements, but
I haven't evaluated in depth. I don't want to drop necessary
software, just minimize maintenance for us as a group.
Jason
On Thu, Jun 19, 2008 at 8:49 AM, <R.Apel@t-systems.com> wrote:
> I would not want to drop/cancel e.g. any piece of software which requires tomcat5 \
> libraries to build/run.
> Several jars delivered by tomcat packages are used by many other otherwise \
> unrelated packages.
> That is just why such libraries should reside in %{javadir} and not be buried in \
> some private App-dir like /usr/share/tomcatX/bin or so.
> -----Ursprüngliche Nachricht-----
> Von: jpackage-discuss-bounces@zarb.org [mailto:jpackage-discuss-bounces@zarb.org] \
> Im Auftrag von Jason Corley
> Gesendet: Donnerstag, 19. Juni 2008 14:44
> An: Discussion about JPackage project
> Betreff: Re: [JPackage-discuss] [JPackage-announce] [RPM (5.0)]tomcat5-5.5.26-1jpp
>
> Do we really want multiple tomcat versions in 5.0? I had thought we
> were going with just one major version of the various application and
> servlet engine servers.
> Jason
>
> On Thu, Jun 19, 2008 at 8:00 AM, Will Tatam <will.tatam@red61.com> wrote:
> > When upgrading from the previous version i get
> >
> > Updating : tomcat5 ####################### [10/57]
> > ln: `/usr/share/tomcat5/bin/commons-daemon.jar': File exists
> > ln: `/usr/share/tomcat5/bin/commons-logging-api.jar': File exists
> > ln: `/usr/share/tomcat5/bin/tomcat-juli.jar': File exists
> > /usr/bin/build-jar-repository: error: Could not find ecj Java extension
> > for this JVM
> > /usr/bin/build-jar-repository: error: Some specified jars were not found
> > for this jvm
> >
> >
> > Ralph Apel wrote:
> > > Name : tomcat5 Relocations: (not relocatable)
> > > Version : 5.5.26 Vendor: JPackage Project
> > > Release : 1jpp Build Date: Thu 05 Jun 2008 \
> > > 01:34:53 PM CEST Install Date: (not installed) Build Host: \
> > > altair.localdomain Group : Networking/Daemons Source RPM: \
> > > (none) Size : 5164163 License: Apache Software License
> > > Signature : (none)
> > > Packager : Ralph Apel <r.apel@r-apel.de>
> > > URL : http://tomcat.apache.org
> > > Summary : Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
> > > Description :
> > > 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.
> > >
> > > 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. To
> > > learn more about getting involved, click here.
> > >
> > > ---------------
> > > Ralph Apel <r.apel at r-apel.de> 0:5.5.26-1jpp
> > > - 5.5.26
> > > - Build with java5 for java5
> > > - Add poms and depmap frags
> > > - Move touch and chown of TOMCAT_LOG __after__ possible makeHomeDir
> > > in init script
> > > - Temporarily set umask to 022 in makeHomeDir
> > > - (Build)Require ecj >= 0:3.3.1.1
> > > - Add catalina-deployer.jar to -server-lib
> > > - Move tomcat-juli.jar from /usr/share/tomcat5/bin/ to
> > > versioned/unversioned in /usr/share/java/tomcat5/ with
> > > unversioned symlink where it was
> > > - Replace files commons-daemon.jar and commons-logging-api.jar
> > > in /usr/share/tomcat5/bin/ with symlinks
> > > - Drop dereferencing option on copy of /var/lib/tomcat5
> > > - Switch to standard api (B)Rs and alternatives
> > > ---------------
> > > W: tomcat5 non-standard-group Networking/Daemons
> > > W: tomcat5 strange-permission tomcat5-5.5.init 0755
> > > W: tomcat5 unversioned-explicit-obsoletes servletapi5
> > > W: tomcat5 unversioned-explicit-provides servlet
> > > W: tomcat5 unversioned-explicit-provides servlet5
> > > W: tomcat5 unversioned-explicit-provides servlet24
> > > W: tomcat5 unversioned-explicit-provides servletapi5
> > > W: tomcat5 unversioned-explicit-provides servlet_2_4_api
> > > W: tomcat5 unversioned-explicit-obsoletes servletapi5-javadoc
> > > W: tomcat5 unversioned-explicit-provides servletapi5-javadoc
> > > W: tomcat5 unversioned-explicit-provides jsp
> > > W: tomcat5 unversioned-explicit-provides jsp_2_0_api
> > > W: tomcat5 unversioned-explicit-obsoletes jasper5
> > > W: tomcat5 unversioned-explicit-provides jasper5
> > > W: tomcat5 unversioned-explicit-obsoletes jasper5-javadoc
> > > W: tomcat5 unversioned-explicit-provides jasper5-javadoc
> > >
> > > ---------------
> > > Index: tomcat5.spec
> > > ===================================================================
> > > RCS file: /home/projects/jpackage/cvs/rpms/free/tomcat5/tomcat5.spec,v
> > > retrieving revision 1.3
> > > diff -u -r1.3 tomcat5.spec
> > > --- tomcat5.spec 4 Nov 2005 21:27:58 -0000 1.3
> > > +++ tomcat5.spec 5 Jun 2008 11:46:46 -0000
> > > @@ -1,261 +1,469 @@
> > > -%define name tomcat5
> > > -%define full_name jakarta-%{name}
> > > -%define version 5.0.30
> > > -%define majversion 5.0
> > > -%define release 8jpp
> > > -%define section free
> > > -
> > > -%define summary Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP \
> > > 2.0 API
> > > -%define license Apache Software License
> > > -%define distribution JPackage
> > > -%define vendor JPackage Project
> > > +# Copyright (c) 2000-2008, JPackage Project
> > > +# All rights reserved.
> > > +#
> > > +# Redistribution and use in source and binary forms, with or without
> > > +# modification, are permitted provided that the following conditions
> > > +# are met:
> > > +#
> > > +# 1. Redistributions of source code must retain the above copyright
> > > +# notice, this list of conditions and the following disclaimer.
> > > +# 2. Redistributions in binary form must reproduce the above copyright
> > > +# notice, this list of conditions and the following disclaimer in the
> > > +# documentation and/or other materials provided with the
> > > +# distribution.
> > > +# 3. Neither the name of the JPackage Project nor the names of its
> > > +# contributors may be used to endorse or promote products derived
> > > +# from this software without specific prior written permission.
> > > +#
> > > +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
> > > +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> > > +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
> > > +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
> > > +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> > > +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
> > > +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
> > > +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
> > > +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> > > +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> > > +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> > > +#
> > > +
> > > +%define section free
> > >
> > > -%define jname jasper5
> > > -%define tcuid 91
> > > +%define gcj_support \
> > > %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
> > >
> > > -%define packname jakarta-tomcat-%{version}
> > > -%define packdname jakarta-tomcat-%{version}-src
> > > +# If you want only apis to be built,
> > > +# give rpmbuild option '--with apisonly'
> > > +%define with_apisonly %{?_with_apisonly:1}%{!?_with_apisonly:0}
> > > +%define without_apisonly %{!?_with_apisonly:1}%{?_with_apisonly:0}
> > > +
> > > +# If you don't want direct ecj support to be built in,
> > > +# while ecj isn't available, give rpmbuild option '--without ecj'
> > > +%define without_ecj %{?_without_ecj:1}%{!?_without_ecj:0}
> > > +%define with_ecj %{!?_without_ecj:1}%{?_without_ecj:0}
> > > +
> > > +%define full_jname jasper5
> > > +%define jname jasper
> > > +%define majversion 5.5
> > > +%define minversion 26
> > > +%define servletspec 2.4
> > > +%define jspspec 2.0
> > > +
> > > +%define tcuid 91
> > > +
> > > +%define packdname apache-tomcat-%{version}-src
> > >
> > > # FHS 2.2 compliant tree structure
> > > # see http://www.pathname.com/fhs/2.2/
> > > -%define confdir %{_sysconfdir}/%{name}
> > > -%define logdir %{_localstatedir}/log/%{name}
> > > -%define homedir %{_datadir}/%{name}
> > > -%define bindir %{_datadir}/%{name}/bin
> > > -%define tempdir %{_localstatedir}/cache/%{name}/temp
> > > -%define workdir %{_localstatedir}/cache/%{name}/work
> > > -%define appdir %{_localstatedir}/lib/%{name}/webapps
> > > -%define serverdir %{_localstatedir}/lib/%{name}/server
> > > -%define commondir %{_localstatedir}/lib/%{name}/common
> > > -%define shareddir %{_localstatedir}/lib/%{name}/shared
> > > -
> > > -Summary: %{summary}
> > > -Name: %{name}
> > > -Version: %{version}
> > > -Release: %{release}
> > > -Epoch: 0
> > > -License: %{license}
> > > -Vendor: %{vendor}
> > > -Distribution: %{distribution}
> > > -Group: Networking/Daemons
> > > -URL: http://jakarta.apache.org/tomcat/
> > > -BuildArch: noarch
> > > -Source: \
> > > http://jakarta.apache.org/builds/jakarta-tomcat-5.0/release/v%{version}/src/%{packdname}.tar.gz
> > >
> > > -Source3: TOMCAT4.README.RPM
> > > -Source4: %{name}-%{majversion}.init
> > > -Source5: %{name}-%{majversion}.conf
> > > -Source6: %{name}-%{majversion}.wrapper
> > > -Source8: %{name}-%{majversion}.logrotate
> > > -Source9: %{name}-%{majversion}.relink
> > > -# This file shouldn't be required on any other 5.x releases as it's fixed in
> > > -# CVS -- see http://issues.apache.org/bugzilla/show_bug.cgi?id=32445
> > > -Source10: struts-config.xml
> > > -Patch1: %{name}-%{version}.patch
> > > -Patch2: %{name}-%{majversion}.link_admin_jar.patch
> > > -Patch4: %{name}-%{version}-cluster-pathelement.patch
> > > -Patch5: %{name}-%{version}-skip-build-on-install.patch
> > > -Patch6: %{name}-%{version}-javaxssl.patch
> > > -Patch7: %{jname}_command.patch
> > > -Patch8: %{name}-%{version}-bootstrap.MF.patch
> > > -Patch9: %{name}-%{version}-catalina.sh.patch
> > > -Patch10: %{name}-%{version}-precompile.patch
> > > -Patch11: %{name}-%{version}-no-daemon.patch
> > > -BuildRoot: %{_tmppath}/%{name}-root-%{version}
> > > -
> > > -Requires: jpackage-utils >= 0:1.6.0
> > > -Requires: ant >= 0:1.6.2
> > > -Requires: java-sdk >= 1.4
> > > -Requires: xerces-j2 >= 0:2.6.2
> > > -Requires: xml-commons-apis
> > > -Requires: regexp >= 0:1.3
> > > -Requires: tyrex >= 0:1.0
> > > -Requires: puretls
> > > -# jakarta packages
> > > -Requires: jakarta-commons-beanutils >= 0:1.7.0
> > > -Requires: jakarta-commons-collections >= 0:3.1
> > > -Requires: jakarta-commons-dbcp >= 0:1.2.1
> > > -Requires: jakarta-commons-digester >= 0:1.3
> > > -Requires: jakarta-commons-modeler
> > > -Requires: jakarta-commons-pool >= 0:1.2
> > > -Requires: jakarta-commons-logging >= 0:1.0.4
> > > -Requires: jakarta-commons-fileupload >= 0:1.0-1jpp
> > > -Requires: jakarta-commons-launcher >= 0:0.9
> > > -Requires: jakarta-commons-el >= 0:1.0
> > > -Requires: mx4j >= 0:1.1.1
> > > +%define confdir %{_sysconfdir}/%{name}
> > > +# normally this would be _localstatedir instead of _var, see changelog
> > > +%define logdir %{_var}/log/%{name}
> > > +%define homedir %{_datadir}/%{name}
> > > +%define bindir %{_datadir}/%{name}/bin
> > > +%define tempdir %{_var}/cache/%{name}/temp
> > > +%define workdir %{_var}/cache/%{name}/work
> > > +%define appdir %{_var}/lib/%{name}/webapps
> > > +%define serverdir %{_var}/lib/%{name}/server
> > > +%define commondir %{_var}/lib/%{name}/common
> > > +%define shareddir %{_var}/lib/%{name}/shared
> > > +
> > > +Name: tomcat5
> > > +Epoch: 0
> > > +Version: %{majversion}.%{minversion}
> > > +Release: 1jpp
> > > +Summary: Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
> > > +
> > > +Group: Networking/Daemons
> > > +Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
> > > +Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
> > > +License: Apache Software License
> > > +URL: http://tomcat.apache.org
> > > +Source0: http://www.apache.org/dist/tomcat/tomcat-5/v%{version}/src/%{packdname}.tar.gz
> > > +Source1: %{name}-%{majversion}.init
> > > +Source2: %{name}-%{majversion}.conf
> > > +Source3: %{name}-%{majversion}.wrapper
> > > +Source4: %{name}-%{majversion}.logrotate
> > > +Source5: %{name}-%{majversion}.relink
> > > +Source6: %{name}-poms-%{version}.tar.gz
> > > +Patch0: %{name}-%{majversion}.link_admin_jar.patch
> > > +Patch1: %{name}-%{majversion}-skip-build-on-install.patch
> > > +Patch2: %{name}-%{majversion}-jt5-build.patch
> > > +Patch3: %{name}-%{majversion}-jtc-build.patch
> > > +Patch4: %{name}-%{majversion}-jtj-build.patch
> > > +Patch5: %{name}-%{majversion}-javaxssl.patch
> > > +Patch7: %{name}-%{majversion}-catalina.sh.patch
> > > +Patch8: %{name}-%{majversion}-jasper.sh.patch
> > > +Patch9: %{name}-%{majversion}-jspc.sh.patch
> > > +Patch10: %{name}-%{majversion}-setclasspath.sh.patch
> > > +Patch12: %{name}-%{majversion}-util-build.patch
> > > +Patch13: %{name}-%{version}-http11-build.patch
> > > +Patch14: %{name}-%{majversion}-jk-build.patch
> > > +BuildRoot: %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root
> > > +%if ! %{gcj_support}
> > > +BuildArch: noarch
> > > +%endif
> > > +
> > > +Buildrequires: jpackage-utils >= 0:1.7.4
> > > +BuildRequires: java-devel = 0:1.5.0
> > > +BuildRequires: ant >= 0:1.6.5
> > > +%if %{without_apisonly}
> > > +%if %{with_ecj}
> > > +BuildRequires: ecj >= 0:3.3.1.1
> > > +%endif
> > > +BuildRequires: ant-trax
> > > +BuildRequires: xalan-j2
> > > +BuildRequires: jakarta-commons-beanutils >= 1.7
> > > +BuildRequires: jakarta-commons-collections >= 0:3.1
> > > +BuildRequires: jakarta-commons-daemon >= 1.0
> > > +BuildRequires: jakarta-commons-dbcp >= 0:1.2.1
> > > +BuildRequires: jakarta-commons-digester >= 0:1.7
> > > +BuildRequires: jakarta-commons-logging >= 0:1.0.4
> > > +BuildRequires: jakarta-commons-fileupload >= 0:1.0
> > > +BuildRequires: jakarta-commons-modeler >= 2.0
> > > +BuildRequires: jakarta-commons-pool >= 0:1.2
> > > +BuildRequires: jakarta-commons-launcher >= 0:0.9
> > > +BuildRequires: jakarta-commons-el >= 0:1.0
> > > +BuildRequires: junit >= 0:3.8.1
> > > +BuildRequires: regexp >= 0:1.3
> > > +BuildRequires: struts >= 0:1.2.9
> > > +BuildRequires: xerces-j2 >= 0:2.7.1
> > > +# xml-commons-apis is needed by Xerces-J2
> > > +BuildRequires: xml-commons-jaxp-1.3-apis
> > > +# FIXME taglibs-standard is not listed in the Tomcat build.properties.default
> > > +BuildRequires: jakarta-taglibs-standard >= 0:1.1.0
> > > +# formerly non-free stuff
> > > +# jta can be provided by geronimo-jta-version-api
> > > +BuildRequires: jta_1_0_1B_api
> > > +# jaf can be provided by classpathx-jaf
> > > +BuildRequires: jaf_1_0_2_api
> > > +# javamail can be provided by classpathx-mail
> > > +BuildRequires: javamail_1_3_1_api
> > > +Requires(post): xml-commons-jaxp-1.3-apis
> > > +# libgcj aot-compiled native libraries
> > > +%if %{gcj_support}
> > > +BuildRequires: java-gcj-compat-devel >= 1.0.43
> > > +Requires(post): java-gcj-compat >= 1.0.31
> > > +Requires(postun): java-gcj-compat >= 1.0.31
> > > +%endif
> > > +Requires(post): jpackage-utils >= 0:1.7.4
> > > +Requires(post): /bin/rm
> > > +Requires(post): /sbin/chkconfig
> > > +Requires(post): findutils
> > > +Requires(preun): /bin/rm
> > > +Requires(post): /sbin/chkconfig
> > > +Requires(preun): findutils
> > > +Requires(pre): %{_sbindir}/useradd
> > > +Requires(pre): %{_sbindir}/groupadd
> > > +%endif
> > > +Requires: jpackage-utils >= 0:1.7.4
> > > +# xml parsing packages
> > > +Requires: xerces-j2 >= 0:2.7.1
> > > +Requires: xml-commons-jaxp-1.3-apis
> > > +# jakarta-commons packages
> > > +Requires: jakarta-commons-daemon >= 1.0.1
> > > +Requires: jakarta-commons-launcher >= 0:0.9
> > > # alternatives
> > > -Requires: jaas
> > > -Requires: jndi
> > > -Requires: jndi-ldap
> > > -Requires: jdbc-stdext
> > > -# non-free stuff
> > > -Requires: jta >= 0:1.0.1-0.a.1
> > > -Requires: jaf >= 0:1.0.1
> > > -Requires: javamail >= 0:1.3
> > > -# subpackages
> > > -Requires: %{name}-servlet-2.4-api = %{epoch}:%{version}-%{release}
> > > -Requires: %{name}-jasper = %{epoch}:%{version}-%{release}
> > > -
> > > -Buildrequires: jpackage-utils >= 0:1.6.0
> > > -BuildRequires: ant >= 0:1.6.2
> > > -BuildRequires: java-sdk >= 1.4
> > > -BuildRequires: ant-trax
> > > -BuildRequires: xalan-j2
> > > -BuildRequires: jakarta-commons-beanutils >= 0:1.7.0
> > > -BuildRequires: jakarta-commons-collections >= 0:3.1
> > > -BuildRequires: jakarta-commons-dbcp >= 0:1.2.1
> > > -BuildRequires: jakarta-commons-digester >= 0:1.3
> > > -BuildRequires: jakarta-commons-logging >= 0:1.0.4
> > > -BuildRequires: jakarta-commons-fileupload >= 0:1.0
> > > -BuildRequires: jakarta-commons-modeler
> > > -BuildRequires: jakarta-commons-pool >= 0:1.1
> > > -BuildRequires: jakarta-commons-launcher >= 0:0.9
> > > -BuildRequires: jakarta-commons-el >= 0:1.0
> > > -BuildRequires: jaas
> > > -BuildRequires: jaf >= 0:1.0.1
> > > -BuildRequires: javamail >= 0:1.3
> > > -BuildRequires: jdbc-stdext >= 0:2.0
> > > -BuildRequires: jndi >= 0:1.2.1
> > > -BuildRequires: jndi-ldap
> > > -BuildRequires: jsse >= 0:1.0.2
> > > -BuildRequires: jta >= 0:1.0.1-0.a.1
> > > -BuildRequires: junit >= 0:3.8.1
> > > -BuildRequires: mx4j >= 0:1.1.1
> > > -BuildRequires: regexp >= 0:1.3
> > > -BuildRequires: puretls
> > > -BuildRequires: struts >= 0:1.2
> > > -BuildRequires: tyrex >= 0:1.0
> > > -BuildRequires: xerces-j2 >= 0:2.6.2
> > > -BuildRequires: xml-commons-apis
> > > -BuildRequires: jakarta-taglibs-standard >= 0:1.1.0
> > > +Requires: java-devel >= 0:1.5.0
> > > +# And it needs its own API subpackages for running
> > > +Requires: %{name}-common-lib = %{epoch}:%{version}-%{release}
> > > +Requires: %{name}-server-lib = %{epoch}:%{version}-%{release}
> > >
> > > %description
> > > -Server that conforms to the Servlet 2.4 and JSP 2.0
> > > -specifications from Java Software.
> > > -
> > > -Develop Web applications in Java.
> > > -
> > > -%package servlet-2.4-api
> > > -Group: Internet/WWW/Dynamic Content
> > > -Requires: /usr/sbin/update-alternatives
> > > -Provides: servlet
> > > -Provides: servlet5
> > > -Provides: servlet24
> > > -Obsoletes: servletapi5
> > > -Provides: servletapi5
> > > -Summary: Java servlet and JSP API classes
> > > -
> > > -%description servlet-2.4-api
> > > -This subproject contains the source code for the implementation classes
> > > -of the Java Servlet and JSP APIs (packages javax.servlet).
> > > -
> > > -%package servlet-2.4-api-javadoc
> > > -Group: Development/Documentation
> > > -Obsoletes: servletapi5-javadoc
> > > -Provides: servletapi5-javadoc
> > > -Summary: Javadoc for %{name}-servlet-2.4-api
> > > -
> > > -%description servlet-2.4-api-javadoc
> > > -Javadoc generated Documentation for %{name}-servlet-2.4-api.
> > > -
> > > -%package jasper
> > > -Group: Development/Compilers
> > > -Requires: ant >= 0:1.5.4, jpackage-utils >= 0:1.5.32
> > > -Requires: xerces-j2 >= 0:2.6.0
> > > -Requires: xml-commons-apis >= 0:1.0
> > > -Requires: jakarta-commons-el >= 0:1.0
> > > -Requires: jakarta-commons-collections >= 0:2.1
> > > -Requires: jakarta-commons-logging >= 0:1.0.3
> > > -Requires: %{name}-servlet-2.4-api = %{epoch}:%{version}-%{release}
> > > -Obsoletes: jasper5
> > > -Provides: jasper5
> > > -Summary: Apache JSP Engine, RI for Servlet JSP 2.0 API
> > > -
> > > -%description jasper
> > > -JSP engine that conforms to the JSP 2.0
> > > -specifications from Java Software.
> > > -
> > > -%package jasper-javadoc
> > > -Group: Development/Documentation
> > > -Obsoletes: jasper5-javadoc
> > > -Provides: jasper5-javadoc
> > > -Summary: Javadoc for %{name}-jasper
> > > -
> > > -%description jasper-javadoc
> > > -Javadoc generated Documentation for %{name}-jasper.
> > > +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.
> > > +
> > > +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. To
> > > +learn more about getting involved, click here.
> > >
> > > +%if %{without_apisonly}
> > > %package webapps
> > > -Group: System Environment/Applications
> > > -Requires: %{name} = %{epoch}:%{version}-%{release}
> > > -Requires: jakarta-taglibs-standard >= 0:1.1.0
> > > -Summary: Web Applications for tomcat
> > > +Group: System Environment/Applications
> > > +# Replace PreReq
> > > +Requires(pre): %{name} = %{epoch}:%{version}-%{release}
> > > +Requires(postun): %{name} = %{epoch}:%{version}-%{release}
> > > +Requires: jakarta-taglibs-standard >= 0:1.1.0
> > > +Summary: Web applications for Apache Tomcat
> > > +Requires(post): jpackage-utils >= 0:1.7.4
> > > +Requires(preun): findutils
> > > +Requires(preun): /bin/rm
> > > +
> > > +%if %{gcj_support}
> > > +Requires(post): java-gcj-compat >= 1.0.31
> > > +Requires(postun): java-gcj-compat >= 1.0.31
> > > +%endif
> > >
> > > %description webapps
> > > -Web Applications for tomcat
> > > +Web applications for Apache Tomcat
> > >
> > > %package admin-webapps
> > > -Group: System Environment/Applications
> > > -Requires: %{name} = %{epoch}:%{version}-%{release}
> > > -Requires: struts >= 0:1.2
> > > -Summary: Admin Web Applications for tomcat
> > > +Group: System Environment/Applications
> > > +Summary: The administrative web applications for Apache Tomcat
> > > +# Replace PreReq
> > > +Requires(pre): %{name} = %{epoch}:%{version}-%{release}
> > > +Requires: struts >= 0:1.2.9
> > > +Requires(post): /bin/rm
> > > +Requires(post): jpackage-utils >= 0:1.7.4
> > > +Requires(post): findutils
> > > +Requires(post): jakarta-commons-beanutils
> > > +Requires(post): jakarta-commons-collections
> > > +Requires(post): jakarta-commons-digester
> > > +Requires(post): jakarta-commons-io
> > > +Requires(post): struts
> > > +Requires(preun): findutils
> > > +Requires(preun): /bin/rm
> > > +Requires(postun): %{name} = %{epoch}:%{version}-%{release}
> > > +
> > > +%if %{gcj_support}
> > > +Requires(post): java-gcj-compat >= 1.0.31
> > > +Requires(postun): java-gcj-compat >= 1.0.31
> > > +%endif
> > >
> > > %description admin-webapps
> > > -Admin Web Applications for tomcat
> > > +The administrative web applications (admin and manager) for Apache Tomcat
> > > +%endif
> > >
> > > +%package servlet-%{servletspec}-api
> > > +Group: Internet/WWW/Dynamic Content
> > > +Requires: /usr/sbin/update-alternatives
> > > +Summary: Apache Tomcat Servlet implementation classes
> > > +Obsoletes: servletapi5
> > > +Provides: servlet
> > > +Provides: servlet5
> > > +Provides: servlet24
> > > +Provides: servletapi5
> > > +Provides: servlet_2_4_api
> > > +Requires(post): /sbin/chkconfig
> > > +requires(postun): /sbin/chkconfig
> > > +
> > > +%if %{gcj_support}
> > > +# libgcj aot-compiled native libraries
> > > +Requires(post): java-gcj-compat >= 1.0.31
> > > +Requires(postun): java-gcj-compat >= 1.0.31
> > > +%endif
> > > +
> > > +%description servlet-%{servletspec}-api
> > > +Contains the implementation classes
> > > +of the Apache Tomcat Servlet API (packages javax.servlet).
> > > +
> > > +%package servlet-%{servletspec}-api-javadoc
> > > +Group: Development/Documentation
> > > +Summary: Javadoc generated documentation for \
> > > %{name}-servlet-%{servletspec}-api +Obsoletes: servletapi5-javadoc
> > > +Provides: servletapi5-javadoc
> > > +Requires(post): /bin/rm
> > > +Requires(post): /bin/ln
> > > +
> > > +%description servlet-%{servletspec}-api-javadoc
> > > +Contains the javadoc generated documentation for the implementation classes
> > > +of the Apache Tomcat Servlet and JSP APIs (packages javax.servlet).
> > > +
> > > +%package jsp-%{jspspec}-api
> > > +Group: Internet/WWW/Dynamic Content
> > > +Requires: /usr/sbin/update-alternatives
> > > +Requires: servlet24
> > > +# We need this to indirectly get rid of legacy jsp included in old
> > > +# servlet packages (one day we will be able to remove this)
> > > +# Replace PreReq
> > > +Requires(pre): %{name}-servlet-%{servletspec}-api = \
> > > %{epoch}:%{version}-%{release} +Requires(postun): \
> > > %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release} +Summary: \
> > > Apache Tomcat Servlet and JSP implementation classes +Provides: jsp
> > > +Provides: jsp_2_0_api
> > > +Requires(post): /sbin/chkconfig
> > > +Requires(postun): /sbin/chkconfig
> > > +
> > > +%if %{gcj_support}
> > > +# libgcj aot-compiled native libraries
> > > +Requires(post): java-gcj-compat >= 1.0.31
> > > +Requires(postun): java-gcj-compat >= 1.0.31
> > > +%endif
> > > +
> > > +%description jsp-%{jspspec}-api
> > > +Contains the implementation classes
> > > +of the Apache Tomcat JSP API (packages javax.servlet.jsp).
> > > +
> > > +%package jsp-%{jspspec}-api-javadoc
> > > +Group: Development/Documentation
> > > +Summary: Javadoc generated documentation for %{name}-jsp-%{jspspec}-api
> > > +Requires(post): /bin/rm
> > > +Requires(post): /bin/ln
> > > +
> > > +%description jsp-%{jspspec}-api-javadoc
> > > +Contains the javadoc generated documentation for the implementation classes
> > > +of the Apache Tomcat JSP API (packages javax.servlet.jsp).
> > > +
> > > +%if %{without_apisonly}
> > > +%package common-lib
> > > +Group: Development/Compilers
> > > +Summary: Libraries needed to run the Tomcat Web container (part)
> > > +Requires: java >= 0:1.5.0
> > > +Requires(post): jpackage-utils >= 0:1.7.4
> > > +Requires: jakarta-commons-collections-tomcat5 >= 0:3.1
> > > +Requires(post): jakarta-commons-collections-tomcat5 >= 0:3.1
> > > +Requires: jakarta-commons-dbcp-tomcat5 >= 0:1.2.1
> > > +Requires(post): jakarta-commons-dbcp-tomcat5 >= 0:1.2.1
> > > +Requires: jakarta-commons-el >= 0:1.0
> > > +Requires(post): jakarta-commons-el >= 0:1.0
> > > +# FIXME commons-pool is not listed in the Tomcat build.properties.default
> > > +Requires: jakarta-commons-pool-tomcat5 >= 0:1.2
> > > +Requires(post): jakarta-commons-pool-tomcat5 >= 0:1.2
> > > +%if %{with_ecj}
> > > +Requires: ecj >= 0:3.3.1.1
> > > +Requires(post): ecj >= 0:3.3.1.1
> > > +%endif
> > > +# Other subpackages must go in first
> > > +Requires(post): %{name}-servlet-%{servletspec}-api = \
> > > %{epoch}:%{version}-%{release} +Requires(post): %{name}-jsp-%{jspspec}-api = \
> > > %{epoch}:%{version}-%{release} +Requires(post): %{name}-%{jname} = \
> > > %{epoch}:%{version}-%{release} +Requires: %{name}-servlet-%{servletspec}-api = \
> > > %{epoch}:%{version}-%{release} +Requires: %{name}-jsp-%{jspspec}-api = \
> > > %{epoch}:%{version}-%{release} +Requires: %{name}-%{jname} = \
> > > %{epoch}:%{version}-%{release} +Requires(post): findutils
> > > +Requires(preun): findutils
> > > +Requires(post): /bin/rm
> > > +Requires(preun): /bin/rm
> > > +
> > > +%if %{gcj_support}
> > > +# libgcj aot-compiled native libraries
> > > +Requires(post): java-gcj-compat >= 1.0.31
> > > +Requires(postun): java-gcj-compat >= 1.0.31
> > > +%endif
> > > +
> > > +%description common-lib
> > > +Libraries needed to run the Tomcat Web container (part)
> > > +
> > > +%package server-lib
> > > +Group: Development/Compilers
> > > +Summary: Libraries needed to run the Tomcat Web container (part)
> > > +Requires(post): jpackage-utils >= 0:1.7.4
> > > +Requires: jakarta-commons-modeler >= 2.0
> > > +Requires(post): jakarta-commons-modeler >= 2.0
> > > +# Other subpackages must go in first
> > > +Requires: %{name}-%{jname} = %{epoch}:%{version}-%{release}
> > > +Requires(post): %{name}-%{jname} = %{epoch}:%{version}-%{release}
> > > +Requires(post): findutils
> > > +Requires(preun): findutils
> > > +Requires(post): /bin/rm
> > > +Requires(preun): /bin/rm
> > > +%if %{gcj_support}
> > > +# libgcj aot-compiled native libraries
> > > +Requires(post): java-gcj-compat >= 1.0.31
> > > +Requires(postun): java-gcj-compat >= 1.0.31
> > > +%endif
> > > +
> > > +%description server-lib
> > > +Libraries needed to run the Tomcat Web container (part)
> > > +
> > > +%package %{jname}
> > > +Group: Development/Compilers
> > > +Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
> > > +Summary: Compiler JARs and associated scripts for %{name}
> > > +Obsoletes: jasper5
> > > +Provides: jasper5
> > > +
> > > +%if %{gcj_support}
> > > +# libgcj aot-compiled native libraries
> > > +Requires(post): java-gcj-compat >= 1.0.31
> > > +Requires(postun): java-gcj-compat >= 1.0.31
> > > +%endif
> > > +
> > > +%description %{jname}
> > > +Compiler JARs and associated scripts for %{name}
> > > +
> > > +%package %{jname}-javadoc
> > > +Group: Development/Documentation
> > > +Summary: Javadoc generated documentation for %{name}-%{jname}
> > > +Obsoletes: jasper5-javadoc
> > > +Provides: jasper5-javadoc
> > > +
> > > +%description %{jname}-javadoc
> > > +Javadoc for generated documentation %{name}-%{jname}
> > > +%endif
> > >
> > > %prep
> > > -%setup -q -c -T -a 0
> > > +%{__rm} -rf ${RPM_BUILD_DIR}/%{name}-%{version}
> > >
> > > +%setup -q -c -T -a 0
> > > +gzip -dc %{SOURCE6} | tar xf -
> > > cd %{packdname}
> > > -# %patch0
> > > -%patch1 -p2
> > > -%patch2 -p2
> > > -%patch4 -p2 -b .cluster
> > > -%patch5 -p2 -b .skip
> > > -%patch6 -p0
> > > -%patch7 -p0
> > > -%patch8 -p1
> > > -%patch9 -p1
> > > -%patch10 -p2 -b .orig
> > > -%patch11 -p2 -b .orig
> > > +%patch0 -b .p0
> > > +%patch1 -b .p1
> > > +%patch2 -b .p2
> > > +%patch3 -b .p3
> > > +%patch4 -b .p4
> > > +%patch5 -b .p5
> > > +%patch7 -b .p7
> > > +%patch8 -b .p8
> > > +%patch9 -b .p9
> > > +%patch10 -b .p10
> > > +%patch12 -b .p12
> > > +%patch13 -b .p13
> > > +%patch14 -b .p14
> > > +%if %{without_ecj}
> > > + %{__rm} %{jname}/src/share/org/apache/jasper/compiler/JDTCompiler.java
> > > +%endif
> > >
> > > %build
> > > -
> > > -export CLASSPATH=%(build-classpath xml-commons-apis xalan-j2)
> > > -
> > > -# Remove pre-build jars
> > > -for dir in %{packdname} ; do
> > > - find $dir -name "*.jar" -exec rm -f {} \;
> > > +# remove pre-built binaries
> > > +for dir in ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname} ; do
> > > + find $dir \( -name "*.jar" -o -name "*.class" \) | xargs -t %{__rm} -f
> > > done
> > > -
> > > -pushd %{packdname}
> > > -cp $RPM_BUILD_DIR/%{name}-%{version}/jakarta-tomcat-%{version}-src/jakarta-tomcat-5/LICENSE \
> > > . +# copy license for later doc files declaration
> > > +pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}
> > > + %{__cp} build/LICENSE .
> > > popd
> > > -
> > > -# build jsp-api, servlet-api as ant dist will later on require them for \
> > > webapps
> > > -pushd jakarta-tomcat-%{version}-src/jakarta-servletapi-5
> > > -
> > > -pushd jsr154
> > > -ant -Dservletapi.build=build -Dservletapi.dist=dist -Dbuild.compiler=modern \
> > > dist
> > > -popd
> > > -
> > > -pushd jsr152
> > > -ant -Dservletapi.build=build -Dservletapi.dist=dist -Dbuild.compiler=modern \
> > > dist +# build jspapi and servletapi as ant dist will require them later
> > > +pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi
> > > + pushd jsr154
> > > + ant -Dservletapi.build="build" \
> > > + -Dservletapi.dist="dist" \
> > > + -Dbuild.compiler="modern" dist
> > > + popd
> > > + pushd jsr152
> > > + ant -Dservletapi.build="build" \
> > > + -Dservletapi.dist="dist" \
> > > + -Dbuild.compiler="modern" dist
> > > + popd
> > > popd
> > > -
> > > +%if %{without_apisonly}
> > > +# build jasper subpackage
> > > +pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/%{jname}
> > > + %{__cat} > build.properties << EOBP
> > > +ant.jar=$(build-classpath ant)
> > > +servlet-api.jar=${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar
> > > +jsp-api.jar=${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr152/dist/lib/jsp-api.jar
> > > +tools.jar=%{java.home}/lib/tools.jar
> > > +xerces.jar=$(build-classpath xerces-j2)
> > > +xercesImpl.jar=$(build-classpath jaxp_parser_impl)
> > > +xmlParserAPIs.jar=$(build-classpath xml-commons-jaxp-1.3-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 ecj)
> > > +EOBP
> > > + ant -Djava.home="%{java_home}" -Dbuild.compiler="modern" javadoc
> > > popd
> > >
> > > -
> > > # build tomcat 5
> > > -pushd %{packdname}/jakarta-tomcat-5
> > > -
> > > -cat >> build.properties <<EOBP
> > > +pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/build
> > > + %{__cat} >> build.properties << EOBP
> > > +version=%{version}
> > > +version.build=%{minversion}
> > > ant.jar=%{_javadir}/ant.jar
> > > -ant-launcher.jar=%{_javadir}/ant-launcher.jar
> > > -jtc.home=$RPM_BUILD_DIR/%{name}-%{version}/jakarta-tomcat-%{version}-src/jakarta-tomcat-connectors/
> > >
> > > -jasper.home=$RPM_BUILD_DIR/%{name}-%{version}/jakarta-tomcat-%{version}-src/jakarta-tomcat-jasper/jasper2
> > > +ant-launcher.jar=%{_javadir}/ant.jar
> > > +jtc.home=${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/connectors/
> > > +%{jname}.home=${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/%{jname}
> > > commons-beanutils.jar=$(build-classpath commons-beanutils)
> > > commons-fileupload.jar=$(build-classpath commons-fileupload)
> > > commons-collections.jar=$(build-classpath commons-collections)
> > > +commons-daemon.jar=$(build-classpath commons-daemon)
> > > commons-dbcp.jar=$(build-classpath commons-dbcp)
> > > commons-digester.jar=$(build-classpath commons-digester)
> > > commons-el.jar=$(build-classpath commons-el)
> > > @@ -264,54 +472,47 @@
> > > 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 mx4j/mx4j)
> > > -jmx-tools.jar=$(build-classpath mx4j/mx4j-tools)
> > > -jmxri.jar=$(build-classpath mx4j/mx4j-jmx)
> > > +jmx.jar=$(build-classpath mx4j/mx4j-jmx.jar)
> > > +jmx-remote.jar=$(build-classpath mx4j/mx4j-remote.jar)
> > > +jmx-tools.jar=$(build-classpath mx4j/mx4j-tools.jar)
> > > +jmxri.jar=$(build-classpath mx4j/mx4j-jmx.jar)
> > > junit.jar=$(build-classpath junit)
> > > regexp.jar=$(build-classpath regexp)
> > > -servlet-api.jar=$RPM_BUILD_DIR/%{name}-%{version}/jakarta-tomcat-%{version}-src/jakarta-servletapi-5/jsr154/dist/lib/servlet-api.jar
> > >
> > > -jsp-api.jar=$RPM_BUILD_DIR/%{name}-%{version}/jakarta-tomcat-%{version}-src/jakarta-servletapi-5/jsr152/dist/lib/jsp-api.jar
> > >
> > > -servlet.doc=$RPM_BUILD_DIR/%{name}-%{version}/jakarta-tomcat-%{version}-src/jakarta-servletapi-5/jsr154/dist/docs/api
> > > +servlet-api.jar=${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar
> > > +jsp-api.jar=${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr152/dist/lib/jsp-api.jar
> > > +servlet.doc=${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/docs/api
> > > xercesImpl.jar=$(build-classpath jaxp_parser_impl)
> > > -xml-apis.jar=$(build-classpath xml-commons-apis)
> > > +xml-apis.jar=$(build-classpath xml-commons-jaxp-1.3-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)
> > > +activation.jar=$(build-classpath jaf_1_0_2_api)
> > > +mail.jar=$(build-classpath javamail_1_3_1_api)
> > > +jta.jar=$(build-classpath jta_1_0_1B_api)
> > > jaas.jar=$(build-classpath jaas)
> > > jndi.jar=$(build-classpath jndi)
> > > jdbc20ext.jar=$(build-classpath 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)
> > > servletapi.build.notrequired=true
> > > jspapi.build.notrequired=true
> > > -taglibs-core.jar=$(build-classpath taglibs-core)
> > > -taglibs-standard.jar=$(build-classpath taglibs-standard)
> > > EOBP
> > > -
> > > -# can't use jikes to build tomcat5 (strange)
> > > -ant -Dbuild.compiler=modern -Djava.home=%{java_home} build
> > > -
> > > +ant -Dbuild.compiler="modern" -Djava.home="%{java_home}" init
> > > +cp ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar \
> > > \ + ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/build/build/common/lib/servlet-api.jar
> > > + ant -Dbuild.compiler="modern" -Djava.home="%{java_home}" build
> > > popd
> > > -
> > > # build the connectors
> > > -pushd %{packdname}/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=$RPM_BUILD_DIR/%{name}-%{version}/jakarta-tomcat-%{version}-src/jakarta-servletapi-5/jsr154/dist/lib/servlet-api.jar:\
> > >
> > > -$RPM_BUILD_DIR/%{name}-%{version}/jakarta-tomcat-%{version}-src/jakarta-tomcat-5/build/server/lib/catalina.jar
> > >
> > > -
> > > -cat > build.properties <<EOBP
> > > +pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/connectors
> > > +# use the JARs created above to build
> > > + export CLASSPATH="${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servleta \
> > > pi/jsr154/dist/lib/servlet-api.jar:${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/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-daemon.jar=$(build-classpath commons-daemon)
> > > commons-digester.jar=$(build-classpath commons-digester)
> > > commons-fileupload.jar=$(build-classpath commons-fileupload)
> > > commons-logging.jar=$(build-classpath commons-logging)
> > > @@ -319,442 +520,697 @@
> > > 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)
> > > +jmx.jar=$(build-classpath mx4j/mx4j-jmx)
> > > +activation.jar=$(build-classpath jaf_1_0_2_api)
> > > +mail.jar=$(build-classpath javamail_1_3_1_api)
> > > +jta.jar=$(build-classpath jta_1_0_1B_api)
> > > jaas.jar=$(build-classpath jaas)
> > > jndi.jar=$(build-classpath jndi)
> > > jdbc20ext.jar=$(build-classpath 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)
> > > +tomcat5.home=../../build/build
> > > EOBP
> > > -ant -Dbuild.compiler=modern -Djava.home=%{java_home} build
> > > -export CLASSPATH=$oldclasspath
> > > -popd
> > > -
> > > -# build the webapps and make the tree ready to install
> > > -pushd %{packdname}/jakarta-tomcat-5
> > > -ant -Dbuild.compiler=modern -Djava.home=%{java_home} dist
> > > + ant -Dbuild.compiler="modern" -Djava.home="%{java_home}" build
> > > popd
> > > -
> > > +%endif
> > >
> > > %install
> > > -rm -rf $RPM_BUILD_ROOT
> > > -
> > > -# install RPM README
> > > -cp %{SOURCE3} .
> > > -
> > > +%{__rm} -rf $RPM_BUILD_ROOT
> > > +%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_javadir}
> > > +%if %{without_apisonly}
> > > +export CLASSPATH="%(build-classpath xalan-j2 xml-commons-jaxp-1.3-apis \
> > > jakarta-taglibs-core \
> > > jakarta-taglibs-standard):${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr152/dist/lib/jsp-api.jar"
> > > # build initial path structure
> > > -install -d -m 755 $RPM_BUILD_ROOT/{%{confdir},%{logdir},%{homedir},%{bindir}}
> > > -install -d -m 755 $RPM_BUILD_ROOT/{%{serverdir},%{tempdir},%{workdir}}
> > > -install -d -m 755 $RPM_BUILD_ROOT/{%{appdir},%{commondir},%{shareddir}}
> > > -
> > > -install -d -m 755 \
> > > $RPM_BUILD_ROOT/{%{_bindir},%{_sysconfdir}/{rc.d/init.d,logrotate.d},%{_javadir}}
> > >
> > > -
> > > -install -m 755 %{SOURCE9} $RPM_BUILD_ROOT/%{bindir}/relink
> > > -
> > > -# servlet-api and jsp-api
> > > -pushd %{packdname}/jakarta-servletapi-5
> > > -# jars
> > > -install -m 644 jsr152/dist/lib/jsp-api.jar \
> > > $RPM_BUILD_ROOT%{_javadir}/jspapi-%{version}.jar
> > > -install -m 644 jsr154/dist/lib/servlet-api.jar \
> > > $RPM_BUILD_ROOT%{_javadir}/servletapi5-%{version}.jar
> > > -
> > > -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} \
> > > `echo $jar| sed "s|-%{version}||g"`; done)
> > > -
> > > -# javadoc servlet
> > > -install -d -m 755 \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > -cp -pr jsr154/build/docs/api/* \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > \
> > > -ln -s %{name}-servlet-2.4-api-%{version} \
> > > $RPM_BUILD_ROOT%{_javadocdir}/servletapi5 # ghost symlink
> > > -
> > > -# javadoc jsp
> > > -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-jsp-2.0-api-%{version}
> > > -cp -pr jsr152/build/docs/api/* \
> > > $RPM_BUILD_ROOT%{_javadocdir}/%{name}-jsp-2.0-api-%{version}
> > > -ln -s %{name}-jsp-2.0-api-%{version} $RPM_BUILD_ROOT%{_javadocdir}/jsp-api # \
> > > ghost symlink
> > > -popd
> > > -
> > > -# sysv init and logging
> > > -install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name}
> > > -install %{SOURCE5} $RPM_BUILD_ROOT/%{confdir}/%{name}.conf
> > > -
> > > -pushd %{packdname}/jakarta-tomcat-5
> > > -pushd dist
> > > - mv bin/* ${RPM_BUILD_ROOT}%{bindir}
> > > - mv common/* ${RPM_BUILD_ROOT}%{commondir}
> > > - mv conf/* ${RPM_BUILD_ROOT}%{confdir}
> > > - mv server/* ${RPM_BUILD_ROOT}%{serverdir}
> > > - mv shared/* ${RPM_BUILD_ROOT}%{shareddir}
> > > - mv webapps/* ${RPM_BUILD_ROOT}%{appdir}
> > > -popd
> > > -
> > > -# create reloctomcat5
> > > -cat >> $RPM_BUILD_ROOT%{bindir}/reloctomcat5<<EORLTC
> > > -#!/bin/sh
> > > +%{__install} -d -m 755 \
> > > + ${RPM_BUILD_ROOT}{%{confdir},%{logdir},%{homedir},%{bindir}}
> > > +%{__install} -d -m 755 ${RPM_BUILD_ROOT}{%{serverdir},%{tempdir},%{workdir}}
> > > +%{__install} -d -m 755 ${RPM_BUILD_ROOT}{%{appdir},%{commondir},%{shareddir}}
> > > +%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/{init.d,logrotate.d}
> > > +%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_bindir}
> > > +%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_javadir}/%{name}
> > > +%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_datadir}/maven2/poms
> > > +%{__install} -m 755 %{SOURCE5} ${RPM_BUILD_ROOT}%{bindir}/relink
> > > +# SysV init and configuration
> > > +%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
> > > +# Service-specific configuration file
> > > +cat > %{name} << EOT
> > > +# Service-specific configuration file for %{name} services
> > > +# This will be sourced by the SysV service script after the global
> > > +# configuration file /etc/%{name}/%{name}.conf, thus allowing values
> > > +# to be overridden on a per-service way
> > > #
> > > -
> > > -echo "relocating http & ajp ports to 81xx"
> > > -
> > > -sed -e 's;8080;8180;' \
> > > - -e 's;8081;8181;' \
> > > - -e 's;8082;8182;' \
> > > - -e 's;8443;8543;' \
> > > - -e 's;8009;8109;' \
> > > - %{confdir}/server.xml > %{confdir}/server.xml.reloc
> > > -
> > > -mv %{confdir}/server.xml %{confdir}/server.xml.bak
> > > -cp %{confdir}/server.xml.reloc %{confdir}/server.xml
> > > -
> > > -EORLTC
> > > -
> > > -# rename catalina/jasper into dtomcat5/djasper5 to let wrapper take precedence
> > > -install $RPM_BUILD_ROOT%{bindir}/catalina.sh \
> > > $RPM_BUILD_ROOT%{_bindir}/d%{name}
> > > -rm -f $RPM_BUILD_ROOT%{bindir}/catalina.sh.*
> > > -# Remove leftover files ?
> > > -rm -f $RPM_BUILD_ROOT%{bindir}/*.orig
> > > -
> > > -# install wrapper as tomcat5/jasper5
> > > -install %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}/%{name}
> > > -
> > > +# NEVER change the init script itself:
> > > +# To change values for all services make your changes in
> > > +# /etc/%{name}/%{name}.conf
> > > +# To change values for a specific service, change it here
> > > +# To create a new service, create a link from /etc/init.d/<you new service> to
> > > +# /etc/init.d/%{name} (do not copy the init script) and make a copy of the
> > > +# /etc/sysconfig/%{name} file to /etc/sysconfig/<you new service> and change
> > > +# the property values so the two services won't conflict
> > > +# Register the new service in the system as usual (see chkconfig and similars)
> > > +#
> > > +EOT
> > > +%{__cat} %{SOURCE2} >> %{name}
> > > +%{__install} -m 0644 %{name} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name}
> > > +%{__rm} %{name}
> > > +%{__install} %{SOURCE1} \
> > > + ${RPM_BUILD_ROOT}%{_sysconfdir}/init.d/%{name}
> > > +# Global configuration file
> > > +%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{confdir}
> > > +%{__cat} > %{name}.conf << EOT
> > > +# System-wide configuration file for %{name} services
> > > +# This will be sourced by %{name} and any secondary service
> > > +# Values will be overridden by service-specific configuration
> > > +# files in /etc/sysconfig
> > > +# Use this one to change default values for all services
> > > +# Change the service specific ones to affect only one service
> > > +# (see, for instance, /etc/sysconfig/%{name})
> > > +#
> > > +EOT
> > > +%{__cat} %{SOURCE2} >> %{name}.conf
> > > +%{__install} -m 0644 %{name}.conf ${RPM_BUILD_ROOT}%{confdir}/%{name}.conf
> > > +%{__rm} -f %{name}.conf
> > > +pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/build
> > > + export usejikes="false"
> > > + export OPT_JAR_LIST="ant/ant-trax xalan-j2-serializer"
> > > + ant -Dbuild.compiler="modern" -Djava.home=%{java_home} dist
> > > + pushd dist
> > > + %{__mv} bin/* ${RPM_BUILD_ROOT}%{bindir}
> > > + %{__mv} common/* ${RPM_BUILD_ROOT}%{commondir}
> > > + %{__mv} conf/* ${RPM_BUILD_ROOT}%{confdir}
> > > + %{__mv} server/* ${RPM_BUILD_ROOT}%{serverdir}
> > > + %{__mv} shared/* ${RPM_BUILD_ROOT}%{shareddir}
> > > + %{__mv} webapps/* ${RPM_BUILD_ROOT}%{appdir}
> > > + popd
> > > + pushd build/conf
> > > + %{__mv} uriworkermap.properties workers.properties \
> > > + workers.properties.minimal ${RPM_BUILD_ROOT}%{confdir}
> > > + popd
> > > +popd
> > > +# rename catalina.sh into dtomcat5 to let wrapper take precedence
> > > +%{__install} ${RPM_BUILD_ROOT}%{bindir}/catalina.sh \
> > > + ${RPM_BUILD_ROOT}%{_bindir}/d%{name}
> > > +%{__rm} -f ${RPM_BUILD_ROOT}%{bindir}/catalina.sh.* \
> > > + ${RPM_BUILD_ROOT}%{bindir}/setclasspath.*
> > > +# Remove leftover files
> > > +%{__rm} -f ${RPM_BUILD_ROOT}%{bindir}/*.orig
> > > +# install wrapper as tomcat5
> > > +%{__install} %{SOURCE3} ${RPM_BUILD_ROOT}%{_bindir}/%{name}
> > > # install logrotate support
> > > -install %{SOURCE8} ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}
> > > -
> > > +%{__install} %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}
> > > # remove / reorder non-usefull stuff
> > > -rm -rf $RPM_BUILD_ROOT%{homedir}/src/
> > > -rm -f $RPM_BUILD_ROOT%{bindir}/*.sh $RPM_BUILD_ROOT%{bindir}/*.bat
> > > -rm -rf $RPM_BUILD_ROOT%{bindir}/contrib/
> > > -find $RPM_BUILD_ROOT%{bindir} \
> > > - -name "*.jar" -not -name "bootstrap.jar" | xargs rm -f
> > > -
> > > +%{__rm} -rf ${RPM_BUILD_ROOT}%{homedir}/src/
> > > +%{__rm} -f ${RPM_BUILD_ROOT}%{bindir}/*.sh ${RPM_BUILD_ROOT}%{bindir}/*.bat
> > > # FHS compliance patches, not easy to track them all boys :)
> > > -
> > > -for i in $RPM_BUILD_ROOT%{confdir}/%{name}.conf \
> > > $RPM_BUILD_ROOT%{_bindir}/d%{name} \
> > > - $RPM_BUILD_ROOT%{_bindir}/%{name} \
> > > $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name} \
> > > - $RPM_BUILD_ROOT%{_bindir}/d%{jname} \
> > > $RPM_BUILD_ROOT%{_bindir}/%{jname} \
> > > - $RPM_BUILD_ROOT%{bindir}/relink \
> > > $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
> > > - do
> > > -
> > > - perl -pi -e "s|\@\@\@TCCONF\@\@\@|%{confdir}|g;" $i
> > > - perl -pi -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g;" $i
> > > - perl -pi -e "s|\@\@\@TCBIN\@\@\@|%{bindir}|g;" $i
> > > - perl -pi -e "s|\@\@\@TCCOMMON\@\@\@|%{commondir}|g;" $i
> > > - perl -pi -e "s|\@\@\@TCSERVER\@\@\@|%{serverdir}|g;" $i
> > > - perl -pi -e "s|\@\@\@TCSHARED\@\@\@|%{shareddir}|g;" $i
> > > - perl -pi -e "s|\@\@\@TCAPP\@\@\@|%{appdir}|g;" $i
> > > - perl -pi -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g;" $i
> > > +for i in ${RPM_BUILD_ROOT}%{confdir}/%{name}.conf \
> > > + ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name} \
> > > + ${RPM_BUILD_ROOT}%{_bindir}/d%{name} \
> > > + ${RPM_BUILD_ROOT}%{_bindir}/%{name} \
> > > + ${RPM_BUILD_ROOT}%{_sysconfdir}/init.d/%{name} \
> > > + ${RPM_BUILD_ROOT}%{bindir}/relink \
> > > + ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}; do
> > > + %{__sed} -i -e 's|\@\@\@TCCONF\@\@\@|%{confdir}|g' \
> > > + -e "s|\@\@\@TCCONF\@\@\@|%{confdir}|g" \
> > > + -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
> > > + -e "s|\@\@\@TCBIN\@\@\@|%{bindir}|g" \
> > > + -e "s|\@\@\@TCCOMMON\@\@\@|%{commondir}|g" \
> > > + -e "s|\@\@\@TCSERVER\@\@\@|%{serverdir}|g" \
> > > + -e "s|\@\@\@TCSHARED\@\@\@|%{shareddir}|g" \
> > > + -e "s|\@\@\@TCAPP\@\@\@|%{appdir}|g" \
> > > + -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" $i
> > > done
> > > +# Process bin
> > > +# Remove local JARs (to be replaced with jpp links in post)
> > > +pushd ${RPM_BUILD_ROOT}%{bindir}
> > > + # tomcat-juli will be installed in a public repository
> > > + %{__mv} tomcat-juli.jar \
> > > + ${RPM_BUILD_ROOT}%{_javadir}/%{name}/tomcat-juli-%{version}.jar
> > > + pushd ${RPM_BUILD_ROOT}%{_javadir}/%{name}
> > > + %{__ln_s} -f tomcat-juli-%{version}.jar tomcat-juli.jar
> > > + popd
> > > + %add_to_maven_depmap tomcat tomcat-juli %{version} JPP/%{name} tomcat-juli
> > > + %{__install} -m 644 \
> > > + ${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/tomcat-juli-%{version}.pom \
> > > \ + $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.%{name}-tomcat-juli.pom
> > >
> > > -### Replace local copies with jpp-compatible links
> > > + find . -name "*.jar" -not -name "*bootstrap*" \
> > > + -exec %{__rm} -f {} \;
> > > +popd
> > > # Process server/lib
> > > -pushd $RPM_BUILD_ROOT/%{serverdir}/lib
> > > +# Remove local JARs (to be replaced with jpp links in post)
> > > +pushd ${RPM_BUILD_ROOT}%{serverdir}/lib
> > > find . -name "*.jar" -not -name "catalina*" \
> > > - -not -name "servlets-*" \
> > > - -not -name "tomcat-*" \
> > > - -exec rm -f {} \;
> > > -
> > > + -not -name "servlets-*" \
> > > + -not -name "tomcat-*" | xargs -t %{__rm} -f
> > > # catalina-ant will be installed in a public repository
> > > - mv catalina-ant.jar \
> > > $RPM_BUILD_ROOT/%{_javadir}/catalina-ant-%{version}.jar
> > > -
> > > - pushd $RPM_BUILD_ROOT/%{_javadir}
> > > - ln -fs catalina-ant-%{version}.jar catalina-ant5.jar
> > > + %{__mv} catalina-ant.jar \
> > > + ${RPM_BUILD_ROOT}%{_javadir}/catalina-ant-%{version}.jar
> > > + pushd ${RPM_BUILD_ROOT}%{_javadir}
> > > + %{__ln_s} -f catalina-ant-%{version}.jar catalina-ant5.jar
> > > popd
> > > + %add_to_maven_depmap tomcat catalina-ant %{version} JPP catalina-ant5
> > > + %{__install} -m 644 \
> > > + ${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/catalina-ant-%{version}.pom \
> > > \ + $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-catalina-ant5.pom
> > > +
> > > + # catalina* jars will be installed in a public repository
> > > + for i in catalina*.jar; do
> > > + j="`echo $i | %{__sed} -e 's|\.jar$||'`"
> > > + %{__mv} ${j}.jar \
> > > + ${RPM_BUILD_ROOT}%{_javadir}/%{name}/${j}-%{version}.jar
> > > + pushd ${RPM_BUILD_ROOT}%{_javadir}/%{name}
> > > + %{__ln_s} -f ${j}-%{version}.jar ${j}.jar
> > > + popd
> > > + %add_to_maven_depmap tomcat ${j} %{version} JPP/tomcat5 ${j}
> > > + %{__install} -m 644 \
> > > + ${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/${j}-%{version}.pom \
> > > \ + $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.tomcat5-${j}.pom
> > > + done
> > > + # servlets* jars will be installed in a public repository
> > > + for i in servlets-*.jar; do
> > > + j="`echo $i | %{__sed} -e 's|\.jar$||'`"
> > > + %{__mv} ${j}.jar \
> > > + ${RPM_BUILD_ROOT}%{_javadir}/%{name}/${j}-%{version}.jar
> > > + pushd ${RPM_BUILD_ROOT}%{_javadir}/%{name}
> > > + %{__ln_s} -f ${j}-%{version}.jar ${j}.jar
> > > + popd
> > > + %add_to_maven_depmap tomcat ${j} %{version} JPP/tomcat5 ${j}
> > > + %{__install} -m 644 \
> > > + ${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/${j}-%{version}.pom \
> > > \ + $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.tomcat5-${j}.pom
> > > + done
> > > + # tomcat* jars will be installed in a public repository
> > > + for i in tomcat-*.jar; do
> > > + j="`echo $i | %{__sed} -e 's|\.jar$||'`"
> > > + %{__mv} ${j}.jar \
> > > + ${RPM_BUILD_ROOT}%{_javadir}/%{name}/${j}-%{version}.jar
> > > + pushd ${RPM_BUILD_ROOT}%{_javadir}/%{name}
> > > + %{__ln_s} -f ${j}-%{version}.jar ${j}.jar
> > > + popd
> > > + %add_to_maven_depmap tomcat ${j} %{version} JPP/tomcat5 ${j}
> > > + %{__install} -m 644 \
> > > + ${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/${j}-%{version}.pom \
> > > \ + $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.tomcat5-${j}.pom
> > > + done
> > > popd
> > > -
> > > # Process admin webapp server/webapps/admin
> > > -# don't remove catalina-admin though
> > > -pushd $RPM_BUILD_ROOT/%{serverdir}/webapps/admin/WEB-INF/lib
> > > - find . -name "*.jar" -not -name 'catalina-admin*' -exec rm -f {} \;
> > > - # while we're here we might as well install this
> > > - install %{SOURCE10} ../struts-config.xml
> > > +pushd ${RPM_BUILD_ROOT}%{serverdir}/webapps/admin/WEB-INF/lib
> > > + find . -name "*.jar" -not -name 'catalina-admin*' | xargs -t %{__rm} -f
> > > + for i in catalina-admin; do
> > > + %{__mv} ${i}.jar \
> > > + ${RPM_BUILD_ROOT}%{_javadir}/%{name}/${i}-%{version}.jar
> > > + pushd ${RPM_BUILD_ROOT}%{_javadir}/%{name}
> > > + %{__ln_s} -f ${i}-%{version}.jar ${i}.jar
> > > + popd
> > > + %add_to_maven_depmap tomcat ${i} %{version} JPP/tomcat5 ${i}
> > > + %{__install} -m 644 \
> > > + ${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/${i}-%{version}.pom \
> > > \ + $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.tomcat5-${i}.pom
> > > + done
> > > +popd
> > > +# Process manager webapp server/webapps/manager
> > > +pushd ${RPM_BUILD_ROOT}%{serverdir}/webapps/manager/WEB-INF/lib
> > > + find . -name "*.jar" -not -name 'catalina-manager*' | xargs -t %{__rm} -f
> > > + for i in catalina-manager; do
> > > + %{__mv} ${i}.jar \
> > > + ${RPM_BUILD_ROOT}%{_javadir}/%{name}/${i}-%{version}.jar
> > > + pushd ${RPM_BUILD_ROOT}%{_javadir}/%{name}
> > > + %{__ln_s} -f ${i}-%{version}.jar ${i}.jar
> > > + popd
> > > + %add_to_maven_depmap tomcat ${i} %{version} JPP/tomcat5 ${i}
> > > + %{__install} -m 644 \
> > > + ${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/${i}-%{version}.pom \
> > > \ + $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.tomcat5-${i}.pom
> > > + done
> > > +popd
> > > +# Process host-manager webapp server/webapps/host-manager
> > > +pushd ${RPM_BUILD_ROOT}%{serverdir}/webapps/host-manager/WEB-INF/lib
> > > + find . -name "*.jar" -not -name 'catalina-host-manager*' \
> > > + | xargs -t %{__rm} -f
> > > + for i in catalina-host-manager; do
> > > + %{__mv} ${i}.jar \
> > > + ${RPM_BUILD_ROOT}%{_javadir}/%{name}/${i}-%{version}.jar
> > > + pushd ${RPM_BUILD_ROOT}%{_javadir}/%{name}
> > > + %{__ln_s} -f ${i}-%{version}.jar ${i}.jar
> > > + popd
> > > + %add_to_maven_depmap tomcat ${i} %{version} JPP/tomcat5 ${i}
> > > + %{__install} -m 644 \
> > > + ${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/${i}-%{version}.pom \
> > > \ + $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.tomcat5-${i}.pom
> > > + done
> > > popd
> > > -
> > > # Process common/lib
> > > -pushd $RPM_BUILD_ROOT/%{commondir}/lib
> > > - find . -name "*.jar" -not -name "jasper*" \
> > > - -not -name "naming*" \
> > > - -exec rm -f {} \;
> > > -
> > > +pushd ${RPM_BUILD_ROOT}%{commondir}/lib
> > > + find . -name "*.jar" -not -name "%{jname}*" \
> > > + -not -name "naming*" | xargs -t %{__rm} -f
> > > # jasper's jars will be installed in a public repository
> > > - for i in jasper-compiler jasper-runtime; do
> > > - j=`echo $i | sed 's:jasper-:jasper5-:'`
> > > - mv $i.jar $RPM_BUILD_ROOT%{_javadir}/$j-%{version}.jar
> > > - pushd $RPM_BUILD_ROOT%{_javadir}
> > > - ln -sf $j-%{version}.jar $j.jar
> > > + for i in %{jname}-compiler %{jname}-runtime; do
> > > + j="`echo $i | %{__sed} -e 's|%{jname}-|%{jname}5-|'`"
> > > + %{__mv} ${i}.jar ${RPM_BUILD_ROOT}%{_javadir}/${j}-%{version}.jar
> > > + pushd ${RPM_BUILD_ROOT}%{_javadir}
> > > + %{__ln_s} -f ${j}-%{version}.jar ${j}.jar
> > > + popd
> > > + %add_to_maven_depmap tomcat ${i} %{version} JPP ${j}
> > > + %{__install} -m 644 \
> > > + ${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/${i}-%{version}.pom \
> > > \ + $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-${j}.pom
> > > + done
> > > + # naming* jars will be installed in a public repository
> > > + for i in naming-*.jar; do
> > > + j="`echo $i | %{__sed} -e 's|\.jar$||'`"
> > > + %{__mv} ${j}.jar \
> > > + ${RPM_BUILD_ROOT}%{_javadir}/%{name}/${j}-%{version}.jar
> > > + pushd ${RPM_BUILD_ROOT}%{_javadir}/%{name}
> > > + %{__ln_s} -f ${j}-%{version}.jar ${j}.jar
> > > popd
> > > + %add_to_maven_depmap tomcat ${j} %{version} JPP/tomcat5 ${j}
> > > + %{__install} -m 644 \
> > > + ${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/${j}-%{version}.pom \
> > > \ + $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.tomcat5-${j}.pom
> > > done
> > > popd
> > > -
> > > -# Process common/lib
> > > -pushd $RPM_BUILD_ROOT/%{commondir}/endorsed
> > > - find . -name "*.jar" -exec rm -f {} \;
> > > +# Process common/endorsed
> > > +pushd ${RPM_BUILD_ROOT}%{commondir}/endorsed
> > > + find . -name "*.jar" | xargs -t %{__rm} -f
> > > popd
> > > -
> > > # avoid duplicate servlet.jar
> > > -rm -f $RPM_BUILD_ROOT%{commondir}/lib/servlet.jar
> > > +%{__rm} -f ${RPM_BUILD_ROOT}%{commondir}/lib/servlet.jar
> > > +# Add catalina-deployer
> > > +%{__install} -m 644 %{packdname}/build/deployer/lib/catalina-deployer.jar \
> > > + ${RPM_BUILD_ROOT}%{_javadir}/%{name}/catalina-deployer-%{version}.jar
> > > + pushd ${RPM_BUILD_ROOT}%{_javadir}/%{name}
> > > + %{__ln_s} -f catalina-deployer-%{version}.jar \
> > > catalina-deployer.jar + popd
> > >
> > > # Perform FHS translation
> > > # (final links)
> > > -pushd $RPM_BUILD_ROOT%{homedir}
> > > - [ -d bin ] || ln -fs %{bindir} bin
> > > - [ -d common ] || ln -fs %{commondir} common
> > > - [ -d conf ] || ln -fs %{confdir} conf
> > > - [ -d logs ] || ln -fs %{logdir} logs
> > > - [ -d server ] || ln -fs %{serverdir} server
> > > - [ -d shared ] || ln -fs %{shareddir} shared
> > > - [ -d webapps ] || ln -fs %{appdir} webapps
> > > - [ -d work ] || ln -fs %{workdir} work
> > > - [ -d temp ] || ln -fs %{tempdir} temp
> > > +pushd ${RPM_BUILD_ROOT}%{homedir}
> > > + [ -d bin ] || %{__ln_s} -f %{bindir} bin
> > > + [ -d common ] || %{__ln_s} -f %{commondir} common
> > > + [ -d conf ] || %{__ln_s} -f %{confdir} conf
> > > + [ -d logs ] || %{__ln_s} -f %{logdir} logs
> > > + [ -d server ] || %{__ln_s} -f %{serverdir} server
> > > + [ -d shared ] || %{__ln_s} -f %{shareddir} shared
> > > + [ -d webapps ] || %{__ln_s} -f %{appdir} webapps
> > > + [ -d work ] || %{__ln_s} -f %{workdir} work
> > > + [ -d temp ] || %{__ln_s} -f %{tempdir} temp
> > > popd
> > > -
> > > -cd $RPM_BUILD_DIR/%{name}-%{version}/jakarta-tomcat-%{version}-src
> > > -find $RPM_BUILD_ROOT%{homedir} -type l -maxdepth 1 | sed s+$RPM_BUILD_ROOT++g \
> > > > homelinks
> > > -
> > > +%endif
> > > +# begin servlet api subpackage install
> > > +pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi
> > > + %{__install} -m 644 jsr154/dist/lib/servlet-api.jar \
> > > + ${RPM_BUILD_ROOT}%{_javadir}/%{name}-servlet-%{servletspec}-api-%{version}.jar
> > > + pushd ${RPM_BUILD_ROOT}%{_javadir}
> > > + %{__ln_s} -f %{name}-servlet-%{servletspec}-api-%{version}.jar \
> > > + %{name}-servlet-%{servletspec}-api.jar
> > > + # For backward compatibility with old JPP packages
> > > + %{__ln_s} -f %{name}-servlet-%{servletspec}-api-%{version}.jar \
> > > + servletapi5.jar
> > > + popd
> > > + # depmap frag for standard alternative
> > > + %add_to_maven_depmap javax.servlet servlet-api %{servletspec} JPP \
> > > servlet_2_4_api + %add_to_maven_depmap tomcat servlet-api %{version} JPP \
> > > %{name}-servlet-%{servletspec}-api + %{__install} -m 644 \
> > > + ${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/servlet-api-%{version}.pom \
> > > \ + \
> > > $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}-servlet-%{servletspec}-api.pom
> > > + # javadoc servlet
> > > + %{__install} -d -m 755 \
> > > ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-servlet-%{servletspec}-api-%{version} + \
> > > %{__cp} -pr jsr154/build/docs/api/* \ + \
> > > ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-servlet-%{servletspec}-api-%{version} + \
> > > # ghost symlink + %{__ln_s} -f %{name}-servlet-%{servletspec}-api-%{version} \
> > > \ + ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-servlet-%{servletspec}-api
> > > popd
> > > -
> > > -# jasper
> > > -pushd %{packdname}/jakarta-tomcat-catalina/catalina
> > > -install -m 644 src/bin/setclasspath.sh \
> > > - $RPM_BUILD_ROOT%{_bindir}/%{jname}_classpath.sh
> > > +# begin jsp api subpackage install
> > > +pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi
> > > + %{__install} -m 644 jsr152/dist/lib/jsp-api.jar \
> > > + ${RPM_BUILD_ROOT}%{_javadir}/%{name}-jsp-%{jspspec}-api-%{version}.jar
> > > + pushd ${RPM_BUILD_ROOT}%{_javadir}
> > > + %{__ln_s} -f %{name}-jsp-%{jspspec}-api-%{version}.jar \
> > > + %{name}-jsp-%{jspspec}-api.jar
> > > + # For backward compatibility with old JPP packages
> > > + %{__ln_s} -f %{name}-jsp-%{jspspec}-api-%{version}.jar \
> > > + jspapi.jar
> > > + popd
> > > + %add_to_maven_depmap javax.servlet jsp-api %{jspspec} JPP jsp_2_0_api
> > > + %add_to_maven_depmap tomcat jsp-api %{version} JPP \
> > > %{name}-jsp-%{jspspec}-api + %{__install} -m 644 \
> > > + ${RPM_BUILD_DIR}/%{name}-%{version}/tomcat5-poms/jsp-api-%{version}.pom \
> > > \ + \
> > > $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}-jsp-%{jspspec}-api.pom + \
> > > # javadoc jsp + %{__install} -d -m 755 \
> > > ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-jsp-%{jspspec}-api-%{version} + \
> > > %{__cp} -pr jsr152/build/docs/api/* \ + \
> > > ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-jsp-%{jspspec}-api-%{version} + # \
> > > ghost symlink + %{__ln_s} %{name}-jsp-%{jspspec}-api-%{version} \
> > > + ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-jsp-%{jspspec}-api
> > > popd
> > > -
> > > -pushd %{packdname}/jakarta-tomcat-jasper/jasper2
> > > -install -m 755 build/bin/jspc.sh $RPM_BUILD_ROOT%{_bindir}/jspc5
> > > -install -m 755 build/bin/jasper.sh $RPM_BUILD_ROOT%{_bindir}/%{jname}
> > > -
> > > -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-jasper-%{version}
> > > -cp -pr build/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-jasper-%{version}
> > > -ln -s %{name}-jasper-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-jasper
> > > +%if %{without_apisonly}
> > > +# begin jasper subpackage install
> > > +pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/%{jname}
> > > + %{__install} -m 755 src/bin/jspc.sh \
> > > + ${RPM_BUILD_ROOT}%{_bindir}/jspc5.sh
> > > + %{__install} -m 755 src/bin/%{jname}.sh \
> > > + ${RPM_BUILD_ROOT}%{_bindir}/%{full_jname}.sh
> > > popd
> > > +pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/container
> > > + %{__install} -m 755 catalina/src/bin/setclasspath.sh \
> > > + ${RPM_BUILD_ROOT}%{_bindir}/%{full_jname}-setclasspath.sh
> > > +popd
> > > +# javadoc
> > > +%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_javadocdir}/%{jname}-%{version}
> > > +pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/%{jname}
> > > + %{__cp} -pr build/javadoc/* \
> > > + ${RPM_BUILD_ROOT}%{_javadocdir}/%{jname}-%{version}
> > > + # ghost symlink
> > > + %{__ln_s} %{jname}-%{version} ${RPM_BUILD_ROOT}%{_javadocdir}/%{jname}
> > > +popd
> > > +%endif
> > >
> > > -
> > > +%if %{gcj_support}
> > > +# Remove non-standard jars from the list for aot compilation
> > > +aot-compile-rpm \
> > > + --exclude var/lib/%{name}/webapps/tomcat-docs/appdev/sample/sample.war \
> > > + --exclude var/lib/%{name}/webapps/servlets-examples/WEB-INF/classes \
> > > + --exclude var/lib/%{name}/webapps/jsp-examples/WEB-INF/classes \
> > > + --exclude var/lib/%{name}/webapps/jsp-examples/plugin/applet \
> > > + --exclude var/lib/%{name}/server/lib/servlets-cgi.renametojar \
> > > + --exclude var/lib/%{name}/server/lib/servlets-ssi.renametojar
> > > +%endif
> > >
> > > %clean
> > > -rm -rf $RPM_BUILD_ROOT
> > > -
> > > +%{__rm} -rf $RPM_BUILD_ROOT
> > >
> > > +%if %{without_apisonly}
> > > %post
> > > +%update_maven_depmap
> > > # install tomcat5 (but don't activate)
> > > /sbin/chkconfig --add %{name}
> > > -
> > > -### Create automated links
> > > -### Since all needed extensions may not have been installed for this jvm
> > > -### output is muted
> > > -
> > > -# Try to set a sensible jvm
> > > -unset JAVA_HOME
> > > -[ -r %{confdir}/tomcat5.conf ] && . %{confdir}/tomcat5.conf
> > > -[ -z "$JAVA_HOME" ] && [ -r %{_sysconfdir}/java/java.conf ] && . \
> > > %{_sysconfdir}/java/java.conf
> > > -[ -z "$JAVA_HOME" ] && JAVA_HOME=%{_jvmdir}/java
> > > -
> > > # Remove old automated symlinks
> > > -# we do not want old links if a jar is removed from tomcat's layout
> > > -for repository in %{serverdir}/lib \
> > > - %{commondir}/lib \
> > > - %{commondir}/endorsed ; do
> > > - find $repository -name '\[*\]*.jar' -not -type d -exec rm -f {} \;
> > > +for repository in %{bindir} ; do
> > > + find $repository -name '*.jar' -type l | xargs %{__rm} -f
> > > done
> > > -
> > > -build-jar-repository %{serverdir}/lib commons-beanutils commons-fileupload \
> > > - commons-digester commons-logging \
> > > - commons-modeler commons-el regexp \
> > > - mx4j/mx4j-jmx jaas catalina-ant5 2>&1
> > > -
> > > -build-jar-repository %{commondir}/lib ant ant-launcher commons-collections \
> > > - commons-dbcp commons-pool \
> > > - commons-logging-api commons-el \
> > > - jaf jdbc-stdext jta javamail jndi \
> > > - mx4j/mx4j-jmx jspapi servletapi5 \
> > > - %{jname}-runtime %{jname}-compiler 2>&1
> > > -
> > > +for repository in %{commondir}/endorsed ; do
> > > + find $repository -name '\[*\]*.jar' -not -type d | xargs %{__rm} -f
> > > +done
> > > +for repository in %{commondir}/lib ; do
> > > + find $repository -name '\[*\]*.jar' -not -type d | xargs %{__rm} -f
> > > +done
> > > +for repository in %{serverdir}/lib ; do
> > > + find $repository -name '\[*\]*.jar' -not -type d | xargs %{__rm} -f
> > > +done
> > > +# Create automated links - since all needed extensions may not have been
> > > +# installed for this jvm output is muted
> > > +%{__ln_s} $(build-classpath commons-daemon) %{bindir} 2>&1
> > > +%{__ln_s} $(build-classpath commons-logging-api) %{bindir} 2>&1
> > > +%{__ln_s} $(build-classpath tomcat5/tomcat-juli) %{bindir} 2>&1
> > > build-jar-repository %{commondir}/endorsed jaxp_parser_impl \
> > > - xml-commons-apis 2>&1
> > > -
> > > -
> > > -%post servlet-2.4-api-javadoc
> > > -rm -f %{_javadocdir}/servletapi5
> > > -rm -f %{_javadocdir}/jsp-api
> > > -ln -s %{name}-servlet-2.4-api-%{version} %{_javadocdir}/servletapi5
> > > -ln -s %{name}-jsp-2.0-api-%{version} %{_javadocdir}/jsp-api
> > > -
> > > -
> > > -%postun servlet-2.4-api-javadoc
> > > -if [ "$1" = "0" ]; then
> > > - rm -f %{_javadocdir}/servletapi5
> > > - rm -f %{_javadocdir}/jsp-api
> > > -fi
> > > -
> > > -
> > > -%post jasper-javadoc
> > > -rm -f %{_javadocdir}/%{name}-jasper
> > > -ln -s %{name}-jasper-%{version} %{_javadocdir}/%{name}-jasper
> > > -
> > > -
> > > -%postun jasper-javadoc
> > > -if [ "$1" = "0" ]; then
> > > - rm -f %{_javadocdir}/%{name}-jasper
> > > -fi
> > > -
> > > + xml-commons-jaxp-1.3-apis 2>&1
> > > +build-jar-repository %{commondir}/lib commons-collections-tomcat5 \
> > > + commons-dbcp-tomcat5 commons-el commons-pool-tomcat5 jaf javamail jsp \
> > > + %{name}/naming-factory %{name}/naming-resources servlet \
> > > + %{jname}5-compiler %{jname}5-runtime 2>&1
> > > +%if %{with_ecj}
> > > + build-jar-repository %{commondir}/lib ecj 2>&1
> > > +%endif
> > > +build-jar-repository %{serverdir}/lib catalina-ant5 commons-modeler \
> > > + %{name}/catalina-ant-jmx %{name}/catalina-cluster %{name}/catalina \
> > > + %{name}/catalina-optional %{name}/catalina-storeconfig \
> > > + %{name}/servlets-default %{name}/servlets-invoker %{name}/servlets-webdav \
> > > \ + %{name}/tomcat-ajp %{name}/tomcat-apr %{name}/tomcat-coyote \
> > > + %{name}/tomcat-http %{name}/tomcat-jkstatus-ant %{name}/tomcat-util 2>&1
> > > +%if %{gcj_support}
> > > + %{_bindir}/rebuild-gcj-db
> > > +%endif
> > > +
> > > +%if %{gcj_support}
> > > +%postun
> > > +%{_bindir}/rebuild-gcj-db
> > > +%endif
> > > +
> > > +%if %{gcj_support}
> > > +%post common-lib
> > > +%{_bindir}/rebuild-gcj-db
> > > +%endif
> > > +
> > > +%if %{gcj_support}
> > > +%postun common-lib
> > > +%{_bindir}/rebuild-gcj-db
> > > +%endif
> > > +
> > > +%if %{gcj_support}
> > > +%post server-lib
> > > +%{_bindir}/rebuild-gcj-db
> > > +%endif
> > > +
> > > +%if %{gcj_support}
> > > +%postun server-lib
> > > +%{_bindir}/rebuild-gcj-db
> > > +%endif
> > >
> > > %post webapps
> > > -
> > > -### Create automated links
> > > -### Since all needed extensions may not have been installed for this jvm
> > > -### output is muted
> > > -
> > > -# Try to set a sensible jvm
> > > -unset JAVA_HOME
> > > -[ -r %{confdir}/tomcat5.conf ] && . %{confdir}/tomcat5.conf
> > > -[ -z "$JAVA_HOME" ] && [ -r %{_sysconfdir}/java/java.conf ] && . \
> > > %{_sysconfdir}/java/java.conf
> > > -[ -z "$JAVA_HOME" ] && JAVA_HOME=%{_jvmdir}/java
> > > -
> > > +# Create automated links - since all needed extensions may not have been
> > > +# installed for this jvm output is muted
> > > build-jar-repository %{appdir}/jsp-examples/WEB-INF/lib \
> > > - jakarta-taglibs-core jakarta-taglibs-standard 2>&1
> > > -
> > > + jakarta-taglibs-core jakarta-taglibs-standard 2>&1
> > > +%if %{gcj_support}
> > > + %{_bindir}/rebuild-gcj-db
> > > +%endif
> > > +
> > > +%if %{gcj_support}
> > > +%postun webapps
> > > + %{_bindir}/rebuild-gcj-db
> > > +%endif
> > >
> > > %post admin-webapps
> > > -
> > > -### Create automated links
> > > -### Since all needed extensions may not have been installed for this jvm
> > > -### output is muted
> > > -
> > > -# Try to set a sensible jvm
> > > -unset JAVA_HOME
> > > -[ -r %{confdir}/tomcat5.conf ] && . %{confdir}/tomcat5.conf
> > > -[ -z "$JAVA_HOME" ] && [ -r %{_sysconfdir}/java/java.conf ] && . \
> > > %{_sysconfdir}/java/java.conf
> > > -[ -z "$JAVA_HOME" ] && JAVA_HOME=%{_jvmdir}/java
> > > -
> > > # Remove old automated symlinks
> > > -# we do not want old links if a jar is removed from tomcat's layout
> > > -find %{serverdir}/webapps/admin/WEB-INF/lib -name '\[*\]*.jar' \
> > > - -not -name 'catalina-admin*' -not -type d -exec rm -f {} \;
> > > +find %{serverdir}/webapps/admin/WEB-INF/lib -name '\[*\]*.jar' -type d \
> > > + | xargs %{__rm} -f
> > > +# Create automated links - since all needed extensions may not have been
> > > +# installed for this jvm output is muted
> > > +build-jar-repository %{serverdir}/webapps/admin/WEB-INF/lib \
> > > + commons-beanutils commons-collections commons-digester struts \
> > > + %{name}/catalina-admin 2>&1
> > > +build-jar-repository %{serverdir}/webapps/host-manager/WEB-INF/lib \
> > > + %{name}/catalina-host-manager 2>&1
> > > +build-jar-repository %{serverdir}/webapps/manager/WEB-INF/lib \
> > > + commons-io commons-fileupload %{name}/catalina-manager 2>&1
> > > +%if %{gcj_support}
> > > + %{_bindir}/rebuild-gcj-db
> > > +%endif
> > > +
> > > +%if %{gcj_support}
> > > +%postun admin-webapps
> > > + %{_bindir}/rebuild-gcj-db
> > > +%endif
> > > +%endif
> > > +
> > > +%post servlet-%{servletspec}-api
> > > +update-alternatives --install %{_javadir}/servlet.jar servlet \
> > > + %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 20400
> > > +update-alternatives --install %{_javadir}/servlet_2_4_api.jar servlet_2_4_api \
> > > \ + %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 20400
> > > +%if %{gcj_support}
> > > + %{_bindir}/rebuild-gcj-db
> > > +%endif
> > > +
> > > +%post servlet-%{servletspec}-api-javadoc
> > > +%{__rm} -f %{_javadocdir}/servletapi # legacy symlink
> > > +%{__rm} -f %{_javadocdir}/%{name}-servlet-%{servletspec}-api
> > > +%{__ln_s} %{name}-servlet-%{servletspec}-api-%{version} \
> > > + %{_javadocdir}/%{name}-servlet-%{servletspec}-api
> > >
> > > -build-jar-repository %{serverdir}/webapps/admin/WEB-INF/lib struts 2>&1
> > > +%postun servlet-%{servletspec}-api
> > > +if [ "$1" = "0" ]; then
> > > + update-alternatives --remove servlet \
> > > + %{_javadir}/%{name}-servlet-%{servletspec}-api.jar
> > > + update-alternatives --remove servlet_2_4_api \
> > > + %{_javadir}/%{name}-servlet-%{servletspec}-api.jar
> > > +fi
> > > +%if %{gcj_support}
> > > + %{_bindir}/rebuild-gcj-db
> > > +%endif
> > > +
> > > +%post jsp-%{jspspec}-api
> > > +update-alternatives --install %{_javadir}/jsp.jar jsp \
> > > + %{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20000
> > > +update-alternatives --install %{_javadir}/jsp_2_0_api.jar jsp_2_0_api \
> > > + %{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20000
> > > +
> > > +%if %{gcj_support}
> > > + %{_bindir}/rebuild-gcj-db
> > > +%endif
> > > +
> > > +
> > > +%post jsp-%{jspspec}-api-javadoc
> > > +%{__rm} -f %{_javadocdir}/jsp-api # legacy symlink
> > > +%{__rm} -f %{_javadocdir}/%{name}-jsp-%{jspspec}-api
> > > +%{__ln_s} %{name}-jsp-%{jspspec}-api-%{version} \
> > > + %{_javadocdir}/%{name}-jsp-%{jspspec}-api
> > >
> > > +%postun jsp-%{jspspec}-api
> > > +if [ "$1" = "0" ]; then
> > > + update-alternatives --remove jsp \
> > > + %{_javadir}/%{name}-jsp-%{jspspec}-api.jar
> > > + update-alternatives --remove jsp_2_0_api \
> > > + %{_javadir}/%{name}-jsp-%{jspspec}-api.jar
> > > +fi
> > > +%if %{gcj_support}
> > > + %{_bindir}/rebuild-gcj-db
> > > +%endif
> > >
> > > +%if %{without_apisonly}
> > > %preun
> > > -# Always clean up wordir and tempdir on upgrade/removal
> > > -rm -fr %{workdir}/* %{tempdir}/*
> > > -
> > > +# Always clean up workdir and tempdir on upgrade/removal
> > > +%{__rm} -fr %{workdir}/* %{tempdir}/*
> > > if [ $1 = 0 ]; then
> > > - [ -f /var/lock/subsys/%{name} ] && %{_sysconfdir}/rc.d/init.d/%{name} stop
> > > - [ -f %{_sysconfdir}/rc.d/init.d/%{name} ] && /sbin/chkconfig --del %{name}
> > > -
> > > -# %{_sbindir}/userdel tomcat4 >> /dev/null 2>&1 || :
> > > -# %{_sbindir}/groupdel tomcat4 >> /dev/null 2>&1 || :
> > > -
> > > + [ -f /var/lock/subsys/%{name} ] && %{_sysconfdir}/init.d/%{name} stop
> > > + [ -f %{_sysconfdir}/init.d/%{name} ] && /sbin/chkconfig --del %{name}
> > > # Remove automated symlinks
> > > - for repository in %{serverdir}/lib \
> > > - %{commondir}/lib \
> > > - %{commondir}/endorsed ; do
> > > - find $repository -name '\[*\]*.jar' -not -type d -exec rm -f {} \;
> > > + for repository in %{commondir}/endorsed; do
> > > + find $repository -name '\[*\]*.jar' -not -type d | xargs %{__rm} -f
> > > + done
> > > + for repository in %{commondir}/lib ; do
> > > + find $repository -name '\[*\]*.jar' -not -type d | xargs %{__rm} -f
> > > + done
> > > + for repository in %{serverdir}/lib ; do
> > > + find $repository -name '\[*\]*.jar' -not -type d | xargs %{__rm} -f
> > > done
> > > fi
> > >
> > > -
> > > %preun admin-webapps
> > > -
> > > if [ $1 = 0 ]; then
> > > - find %{serverdir}/webapps/admin/WEB-INF/lib \
> > > - -name '\[*\]*.jar' \
> > > - -not -name 'catalina-admin*' -not -type d -exec rm -f {} \;
> > > + find %{serverdir}/webapps/*/WEB-INF/lib \
> > > + -name '\[*\]*.jar' -not -type d | xargs %{__rm} -f
> > > fi
> > >
> > > %preun webapps
> > > -
> > > if [ $1 = 0 ]; then
> > > find %{appdir}/jsp-examples/WEB-INF/lib \
> > > - -name '\[*\]*.jar' \
> > > - -not -type d -exec rm -f {} \;
> > > + -name '\[*\]*.jar' \
> > > + -not -type d | xargs %{__rm} -f
> > > fi
> > >
> > > -
> > > -
> > > %pre
> > > # Add the "tomcat" user and group
> > > # we need a shell to be able to use su - later
> > > -%{_sbindir}/groupadd -g %{tcuid} -r tomcat4 2> /dev/null || :
> > > -%{_sbindir}/useradd -c "Tomcat4" -u %{tcuid} -g tomcat4 \
> > > - -s /bin/sh -r -d %{homedir} tomcat4 2> /dev/null || :
> > > -
> > > +%{_sbindir}/groupadd -g %{tcuid} -r tomcat 2> /dev/null || :
> > > +%{_sbindir}/useradd -c "Apache Tomcat" -u %{tcuid} -g tomcat \
> > > + -s /bin/sh -r -d %{homedir} tomcat 2> /dev/null || :
> > > +%endif
> > >
> > > -%files -f %{packdname}/homelinks
> > > +%if %{without_apisonly}
> > > +%files
> > > %defattr(644,root,root,755)
> > > -%doc TOMCAT4.README.RPM \
> > > %{packdname}/jakarta-tomcat-5/{LICENSE,RELE*,RUNNING.txt,BENCHMARKS.txt} +%doc \
> > > %{packdname}/build/{LICENSE,RELE*,RUNNING.txt,BENCHMARKS.txt} +# symlinks
> > > +%{_datadir}/%{name}/common
> > > +%{_datadir}/%{name}/temp
> > > +%{_datadir}/%{name}/logs
> > > +%{_datadir}/%{name}/conf
> > > +%{_datadir}/%{name}/server
> > > +%{_datadir}/%{name}/shared
> > > +%{_datadir}/%{name}/work
> > > +%{_datadir}/%{name}/webapps
> > > # Normal directories
> > > %dir %{homedir}
> > > %dir %{bindir}
> > > -%dir %{_localstatedir}/lib/%{name}
> > > -%dir %{_localstatedir}/cache/%{name}
> > > +%dir %{_var}/lib/%{name}
> > > +%dir %{_var}/cache/%{name}
> > > %dir %{commondir}
> > > +%dir %{commondir}/classes
> > > +%dir %{commondir}/lib
> > > +%dir %{commondir}/endorsed
> > > +%dir %{commondir}/i18n
> > > %dir %{serverdir}
> > > %dir %{serverdir}/classes
> > > %dir %{serverdir}/lib
> > > +%{serverdir}/lib/*.renametojar
> > > %dir %{shareddir}
> > > %dir %{shareddir}/classes
> > > %dir %{shareddir}/lib
> > > -
> > > -%{_javadir}/catalina*.jar
> > > -
> > > # Directories with special permissions
> > > -%attr(775,root,tomcat4) %dir %{appdir}
> > > -%attr(775,root,tomcat4) %dir %{confdir}
> > > -%attr(775,root,tomcat4) %dir %{tempdir}
> > > -%attr(775,root,tomcat4) %dir %{workdir}
> > > -%attr(755,tomcat4,tomcat4) %dir %{logdir}
> > > -%attr(775,root,tomcat4) %dir %{confdir}/Catalina
> > > -%attr(775,root,tomcat4) %dir \
> > > %{confdir}/Catalina/localhost
> > > -
> > > -%attr(755,root,root) %{_bindir}/*tomcat*
> > > -%attr(755,root,root) %{bindir}/re*
> > > -%attr(755,root,root) %{_sysconfdir}/rc.d/init.d/%{name}
> > > -%{bindir}/bootstrap.jar
> > > -
> > > -%attr(644,root,tomcat4) %config(noreplace) \
> > > %{confdir}/catalina.policy
> > > -%attr(644,root,tomcat4) %config(noreplace) \
> > > %{confdir}/catalina.properties
> > > -%attr(660,root,tomcat4) %config(noreplace) %{confdir}/jk2.properties
> > > -%attr(660,root,tomcat4) %config(noreplace) \
> > > %{confdir}/tomcat-users.xml
> > > -%config(noreplace) %{confdir}/tomcat5.conf
> > > +%attr(775,root,tomcat) %dir %{appdir}
> > > +%attr(775,root,tomcat) %dir %{confdir}
> > > +%attr(770,root,tomcat) %dir %{tempdir}
> > > +%attr(770,root,tomcat) %dir %{workdir}
> > > +%attr(755,tomcat,tomcat) %dir %{logdir}
> > > +%attr(775,root,tomcat) %dir %{confdir}/Catalina
> > > +%attr(775,root,tomcat) %dir %{confdir}/Catalina/localhost
> > > +%attr(755,root,root) %{_bindir}/*
> > > +%attr(755,root,root) %{bindir}/relink
> > > +%attr(644,root,root) %{bindir}/*.jar
> > > +%attr(644,root,root) %{bindir}/*.xml
> > > +%attr(755,root,root) %{_sysconfdir}/init.d/%{name}
> > > +%attr(644,root,tomcat) %config(noreplace) %{confdir}/catalina.policy
> > > +%attr(644,root,tomcat) %config(noreplace) %{confdir}/catalina.properties
> > > +%attr(660,root,tomcat) %config(noreplace) %{confdir}/logging.properties
> > > +%attr(660,root,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml
> > > +%config(noreplace) %{confdir}/%{name}.conf
> > > %config(noreplace) %{confdir}/server-minimal.xml
> > > %config(noreplace) %{confdir}/server.xml
> > > %config(noreplace) %{confdir}/web.xml
> > > -
> > > -# %{confdir}/server-noexamples.xml.config
> > > +%config(noreplace) %{confdir}/context.xml
> > > +%config(noreplace) %{confdir}/uriworkermap.properties
> > > +%config(noreplace) %{confdir}/workers.properties
> > > +%config(noreplace) %{confdir}/workers.properties.minimal
> > > %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
> > > -%{commondir}/*
> > > -%{serverdir}/lib/*
> > > -# %{tempdir}/README.txt
> > > +%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
> > > +%{commondir}/i18n/*
> > > +%{_mavendepmapfragdir}
> > > +%{_datadir}/maven2/poms
> > > +%if %{gcj_support}
> > > +%attr(-,root,root) %{_libdir}/gcj/%{name}/bootstrap*
> > > +%attr(-,root,root) %{_libdir}/gcj/%{name}/commons-daemon*
> > > +%attr(-,root,root) %{_libdir}/gcj/%{name}/commons-logging-api*
> > > +#%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-juli*
> > > +%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-jkstatus-ant*
> > > +%endif
> > >
> > > -%files servlet-2.4-api
> > > -%defattr(-,root,root)
> > > -%doc %{packdname}/jakarta-tomcat-5/LICENSE
> > > -%{_javadir}/servletapi5*.jar
> > > -%{_javadir}/jspapi*.jar
> > > -
> > > -%files servlet-2.4-api-javadoc
> > > -%defattr(-,root,root)
> > > -%doc %{_javadocdir}/%{name}-servlet-2.4-api-%{version}
> > > -%doc %{_javadocdir}/%{name}-jsp-2.0-api-%{version}
> > > -%ghost %doc %{_javadocdir}/servletapi5
> > > -%ghost %doc %{_javadocdir}/jsp-api
> > > -
> > > -%files jasper
> > > -%defattr(-,root,root)
> > > -%doc %{packdname}/jakarta-tomcat-5/LICENSE
> > > -%doc %{packdname}/jakarta-tomcat-jasper/jasper2/README.txt
> > > -%doc %{packdname}/jakarta-tomcat-jasper/jasper2/doc/*
> > > -%{_javadir}/jasper*.jar
> > > -%{_bindir}/j*
> > > +%files common-lib
> > > +%defattr(644,root,root,755)
> > > +%dir %{_javadir}/%{name}
> > > +%{_javadir}/%{name}/naming*.jar
> > > +%{_mavendepmapfragdir}
> > > +%{_datadir}/maven2/poms
> > > +%if %{gcj_support}
> > > +%attr(-,root,root) %{_libdir}/gcj/%{name}/naming-*
> > > +%endif
> > >
> > > -%files jasper-javadoc
> > > -%defattr(-,root,root)
> > > -%doc %{_javadocdir}/%{name}-jasper-%{version}
> > > -%ghost %doc %{_javadocdir}/%{name}-jasper
> > > +%files server-lib
> > > +%defattr(644,root,root,755)
> > > +%{_javadir}/catalina*.jar
> > > +%dir %{_javadir}/%{name}
> > > +%{_javadir}/%{name}/catalina-ant-jmx*.jar
> > > +%{_javadir}/%{name}/catalina-cluster*.jar
> > > +%{_javadir}/%{name}/catalina-deployer*.jar
> > > +%{_javadir}/%{name}/catalina.jar
> > > +%{_javadir}/%{name}/catalina-%{version}.jar
> > > +%{_javadir}/%{name}/catalina-optional*.jar
> > > +%{_javadir}/%{name}/catalina-storeconfig*.jar
> > > +%{_javadir}/%{name}/servlets*.jar
> > > +%{_javadir}/%{name}/tomcat*.jar
> > > +%{_mavendepmapfragdir}
> > > +%{_datadir}/maven2/poms
> > > +%if %{gcj_support}
> > > +%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-ant*
> > > +%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-cluster*
> > > +%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-optional*
> > > +%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-storeconfig*
> > > +%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-%{version}.jar*
> > > +%attr(-,root,root) %{_libdir}/gcj/%{name}/servlets-default*
> > > +%attr(-,root,root) %{_libdir}/gcj/%{name}/servlets-invoker*
> > > +%attr(-,root,root) %{_libdir}/gcj/%{name}/servlets-webdav*
> > > +%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-ajp*
> > > +%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-apr*
> > > +%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-coyote*
> > > +%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-http*
> > > +%attr(-,root,root) %{_libdir}/gcj/%{name}/tomcat-util*
> > > +%endif
> > >
> > > %files webapps
> > > -%defattr(644,root,tomcat4,775)
> > > +%defattr(644,root,tomcat,775)
> > > %dir %{appdir}/servlets-examples
> > > %{appdir}/servlets-examples/*
> > > %dir %{appdir}/jsp-examples
> > > @@ -765,73 +1221,329 @@
> > > %{appdir}/tomcat-docs/*
> > > %dir %{appdir}/webdav
> > > %{appdir}/webdav/*
> > > +%if %{gcj_support}
> > > +%ifnarch ppc64 s390x
> > > +%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-root*
> > > +%endif
> > > +%endif
> > >
> > > %files admin-webapps
> > > -%defattr(640,root,tomcat4,750)
> > > -%attr(660,root,tomcat4) %{confdir}/Catalina/localhost/manager.xml
> > > -%{confdir}/Catalina/localhost/balancer.xml
> > > +%defattr(640,root,tomcat,750)
> > > +%attr(660,root,tomcat) %{confdir}/Catalina/localhost/manager.xml
> > > +%attr(660,root,tomcat) %{confdir}/Catalina/localhost/host-manager.xml
> > > %{confdir}/Catalina/localhost/admin.xml
> > > %dir %{appdir}/balancer
> > > %{appdir}/balancer/*
> > > -%defattr(644,root,tomcat4,750)
> > > %dir %{serverdir}/webapps
> > > %{serverdir}/webapps/*
> > > +%attr(644,root,root) %{_javadir}/%{name}/catalina-admin*.jar
> > > +%attr(644,root,root) %{_javadir}/%{name}/catalina-manager*.jar
> > > +%attr(644,root,root) %{_javadir}/%{name}/catalina-host-manager*.jar
> > > +%if %{gcj_support}
> > > +%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-admin*
> > > +%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-balancer*
> > > +%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-host-manager*
> > > +%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-manager*
> > > +%endif
> > > +
> > > +%files %{jname}
> > > +%defattr(644,root,root,755)
> > > +%doc ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/%{jname}/doc/jspc.html
> > > +%{_javadir}/%{jname}5-*.jar
> > > +%attr(755,root,root) %{_bindir}/%{jname}*.sh
> > > +%attr(755,root,root) %{_bindir}/jspc*.sh
> > > +%{_mavendepmapfragdir}
> > > +%{_datadir}/maven2/poms
> > > +%if %{gcj_support}
> > > +%attr(-,root,root) %{_libdir}/gcj/%{name}/%{jname}5-*
> > > +%endif
> > > +
> > > +%files %{jname}-javadoc
> > > +%defattr(0644,root,root,0755)
> > > +%{_javadocdir}/%{jname}-%{version}
> > > +%ghost %doc %{_javadocdir}/%{jname}
> > > +%endif
> > > +
> > > +%files servlet-%{servletspec}-api
> > > +%defattr(-,root,root)
> > > +%doc %{packdname}/build/LICENSE
> > > +%{_javadir}/%{name}-servlet-%{servletspec}-api*.jar
> > > +%{_javadir}/servletapi5.jar
> > > +%{_mavendepmapfragdir}
> > > +%{_datadir}/maven2/poms
> > > +%if %{gcj_support}
> > > +%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-servlet-%{servletspec}-api*
> > > +%endif
> > > +
> > > +%files servlet-%{servletspec}-api-javadoc
> > > +%defattr(-,root,root)
> > > +%doc %{_javadocdir}/%{name}-servlet-%{servletspec}-api-%{version}
> > > +%ghost %doc %{_javadocdir}/%{name}-servlet-%{servletspec}-api
> > > +
> > > +%files jsp-%{jspspec}-api
> > > +%defattr(-,root,root)
> > > +%doc %{packdname}/build/LICENSE
> > > +%{_javadir}/%{name}-jsp-%{jspspec}-api*.jar
> > > +%{_javadir}/jspapi.jar
> > > +%{_mavendepmapfragdir}
> > > +%{_datadir}/maven2/poms
> > > +%if %{gcj_support}
> > > +%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-jsp-%{jspspec}-api*
> > > +%endif
> > > +
> > > +%files jsp-%{jspspec}-api-javadoc
> > > +%defattr(-,root,root)
> > > +%doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api-%{version}
> > > +%ghost %doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api
> > >
> > > %changelog
> > > -* Thu Jul 21 2005 Gary Benson <gbenson@redhat.com> 0:5.0.30-8jpp
> > > -- Correct ownership of admin webapps directory.
> > > +* Thu Jun 05 2008 Ralph Apel <r.apel at r-apel.de> 0:5.5.26-1jpp
> > > +- 5.5.26
> > > +- Build with java5 for java5
> > > +- Add poms and depmap frags
> > > +- Move touch and chown of TOMCAT_LOG __after__ possible makeHomeDir
> > > + in init script
> > > +- Temporarily set umask to 022 in makeHomeDir
> > > +- (Build)Require ecj >= 0:3.3.1.1
> > > +- Add catalina-deployer.jar to -server-lib
> > > +- Move tomcat-juli.jar from /usr/share/tomcat5/bin/ to
> > > + versioned/unversioned in /usr/share/java/tomcat5/ with
> > > + unversioned symlink where it was
> > > +- Replace files commons-daemon.jar and commons-logging-api.jar
> > > + in /usr/share/tomcat5/bin/ with symlinks
> > > +- Drop dereferencing option on copy of /var/lib/tomcat5
> > > +- Switch to standard api (B)Rs and alternatives
> > > +
> > > +* Mon Sep 4 2007 Jason Corley <jason.corley@gmail.com> 0:5.5.25-1jpp
> > > +- 5.5.25
> > > +- make relink script disabled by default (Larry Walton)
> > > +
> > > +* Sun Jul 8 2007 Jason Corley <jason.corley@gmail.com> 0:5.5.23-11jpp
> > > +- bug 277: add jakarta-commons-io to manager webapp (Alexander Kurtakov)
> > > +- bug 276: broken admin webapp (Vivek Lakshmanan)
> > > +- bug 272: relink script should honor CATALINA_BASE (Andrew Deason)
> > > +- add jakarta-commons-{beanutils,collections,digester} to admin webapp
> > > +- touch/chown catalina.out in init script and remove from package
> > > +- fix init script version call
> > > +- add minversion to fix some of the output from init script version call
> > > +
> > > +* Tue May 30 2007 Jason Corley <jason.corley@gmail.com> 0:5.5.23-10jpp
> > > +- add jaf into common/lib
> > > +- silence %%prep
> > > +
> > > +* Fri May 11 2007 Jason Corley <jason.corley@gmail.com> 0:5.5.23-9jpp
> > > +- rebuild through mock and centos 4
> > > +
> > > +* Thu May 10 2007 Ralph Apel <r.apel at r-apel.de> 0:5.5.23-8jpp
> > > +- Make Vendor, Distribution based on macro
> > > +- Rebuild on FC6 with redhat-rpm-config-8.0.45-9.fc6 installed
> > > + for newer /usr/lib/rpm/redhat/brp-java-repack-jars
> > > +
> > > +* Tue Apr 24 2007 Jason Corley <jason.corley@gmail.com> 0:5.5.23-7jpp
> > > +- bug 253: init script should be in /etc/init.d per LSB (Ralf Hansen)
> > > +- bug 257: require /sbin/chkconfig since SuSE has no package chkconfig
> > > + (Ralf Hansen)
> > > +- bug 261: jasper5.sh tries to use non-existant jars (Vivek Lakshmanan)
> > > +
> > > +* Tue Apr 10 2007 Jason Corley <jason.corley@gmail.com> 0:5.5.23-6jpp
> > > +- put javamail back in common/lib
> > > +- remove find/homelinks junk and just explicitly list the symlinks
> > > +
> > > +* Fri Mar 16 2007 Jason Corley <jason.corley@gmail.com> 0:5.5.23-5jpp
> > > +- replace references to jdtcore with ecj
> > > +
> > > +* Fri Mar 16 2007 Jason Corley <jason.corley@gmail.com> 0:5.5.23-4jpp
> > > +- fix circular dep between main package and common-lib
> > > +- move scriptlets out of common-lib and server-lib and into main package
> > > +
> > > +* Mon Mar 5 2007 Jason Corley <jason.corley@gmail.com> 0:5.5.23-3jpp
> > > +- respin to upload to main repo
> > > +- remove some unnecessary build-jar-repository links created in post of
> > > + common-lib and server-lib subpackages
> > > +- fix chkconfig and lsb comments in init script
> > > +- rpmlint cleanups
> > > +- replace eclipse-ecj with ecj
> > > +
> > > +* Mon Mar 5 2007 Jason Corley <jason.corley@gmail.com> 0:5.5.23-2jpp
> > > +- add a line to build.properties creation with the correct version
> > > + (build.properties.default not updated from 5.5.20)
> > > +
> > > +* Mon Mar 5 2007 Jason Corley <jason.corley@gmail.com> 0:5.5.23-1jpp
> > > +- update to 5.5.23
> > > +
> > > +* Mon Feb 26 2007 Jason Corley <jason.corley@gmail.com> 0:5.5.22-1jpp
> > > +- update to 5.5.22
> > > +- change commons-modeler requirement to 2.0
> > > +
> > > +* Fri Feb 23 2007 Jason Corley <jason.corley@gmail.com> 0:5.5.20-6jpp
> > > +- update year in copyright text
> > > +- use -tomcat5 subpackages for j-c-collections, j-c-dbcp, and j-c-pool so
> > > + that JNDI resources work properly
> > > +- remove searching for a JVM from %%posts since java is not called
> > > +- change symlinks to b-j-r links server/lib to
> > > +- add pre requirement on main package for common-lib subpackage
> > > +
> > > +* Mon Jan 29 2007 Vivek Lakshmanan <vivekl at redhat.com> 0:5.5.20-5jpp
> > > +- Rebuild with a 1.4 JDK instead of JDK 5
> > > +- Minor formatting fixes
> > > +- Add conditional native compilation support
> > > +- Remove aot-compilation and installation of non-standard jars/collections
> > > + of java classes as well as corresponding .SOs
> > > +- Bug 190: set catalina.ext.dirs system property through JAVA_OPTS
> > > + in tomcat5.conf
> > > +- Remove echo statements in the install section since rpm install
> > > + should be silent
> > > +- Add Requires(X) blocks for pre/post/preun/postun scriptlets
> > > +- Replace use of PreReq with Requires(pre) + Requires(postun)
> > > +- Add documentation for sysconfig/tomcat5.conf and /etc/tomcat5.conf
> > > + (courtesy: pcheung at redhat.com)
> > > +- Fix maxdepth position in find statement to avoid warning
> > > +
> > > +* Sun Jan 14 2007 Jason Corley <jason.corley@gmail.com> 0:5.5.20-4jpp
> > > +- remove jk2 configs as mod_jk2 has been deprecated upstream
> > > +- s/Jakarta Tomcat/Apache Tomcat/
> > > +- replace jars in admin webapps with build-jar-repository links
> > > +- silence chatty init script by default
> > > +
> > > +* Wed Jan 10 2007 Jason Corley <jason.corley@gmail.com> 0:5.5.20-3jpp
> > > +- replace _localstatedir with _var since Mandriva seems to think the former is
> > > + equal to /var/lib while all the other distros have it as /var
> > > +- macrofy!
> > > +- use build-jar-repository for jdtcore instead of ln
> > > +- comment out reloctomcat5 for eventual removal completely from spec
> > > +- silence post of common-lib and server-lib subpackages
> > > +- Fixed bugs:
> > > + Bug 217: LSB init comments in init script (Frank Schwichtenberg)
> > > + Bug 242: catalina.out incorrect ownership (Pavel Lisy)
> > > + Bug 245: insecure permissions for temporary and cache directories
> > > + (Troels Arvin)
> > > + Bug 245: no status in initscript (Troels Arvin)
> > > +
> > > +* Tue Oct 31 2006 Jason Corley <jason.corley@gmail.com> 0:5.5.20-2jpp
> > > +- some more init script changes
> > > +- re-add java-devel Requires
> > > +
> > > +* Tue Oct 17 2006 Jason Corley <jason.corley@gmail.com> 0:5.5.20-1jpp
> > > +- 5.5.20
> > > +- completely rewritten init script
> > > +- remove Vendor and Distribution (should be defined in ~/.rpmmacros)
> > > +- replace perl -pi -e with sed -i -e
> > > +
> > > +* Wed Oct 4 2006 Permaine Cheung <pcheung@redhat.com> 0:5.5.17-8jpp
> > > +- Fix condrestart in init script and location of init script in the spec file.
> > > +
> > > +* Mon Oct 2 2006 Permaine Cheung <pcheung@redhat.com> 0:5.5.17-7jpp
> > > +- Add the new config file, and add the CONNECTOR_PORT variable in it.
> > > +
> > > +* Mon Oct 2 2006 Permaine Cheung <pcheung@redhat.com> 0:5.5.17-6jpp
> > > +- Add the ability to start multiple instances of tomcat on the same machine.
> > > +
> > > +* Mon Aug 21 2006 Fernando Nasser <fnasser@redhat.com> 0:5.5.17-5jpp
> > > + From Andrew Overholt <overholt@redhat.com>:
> > > +- Silence post common-lib and server-lib.
> > > +
> > > +* Thu Jul 27 2006 Fernando Nasser <fnasser@redhat.com> 0:5.5.17-4jpp
> > > +- Fix regression in relink with changes from Matt Wringe
> > > +
> > > +* Fri Jun 30 2006 Ralph Apel <r.apel@r-apel.de> 0:5.5.17-3jpp
> > > +- Create option --with apisonly to build just tomcat5-servlet-2.4-api,
> > > + tomcat5-jsp-2.0-api and its -javadoc subpackages
> > > +- Create option --without ecj to build even when eclipse-ecj not available
> > > +- Drop several unnecessary export CLASSPATH=
> > > +
> > > +* Mon May 15 2006 Fernando Nasser <fnasser@redhat.com> 0:5.5.17-2jpp
> > > +- Requires on post things that are linked to at post
> > > + Merge changes from downstream:
> > > +- Fix line breaks in the tomcat5 init script
> > > +- Split preun section among main package and the two new subpackages
> > > +- Move catalina-ant*.jar to the server-lib subpackage to avoid circular
> > > + dependency with the main package
> > > +- Remove leading zero from alternative priorities
> > > +- Rebuild with new classpath-mail as javamail alternative
> > > +- Update versions of dependencies and move them to library subpackages
> > > +- Use only jta from geronimo-specs
> > > +
> > > +* Mon May 15 2006 Fernando Nasser <fnasser@redhat.com> 0:5.5.17-1jpp
> > > +- Upgrade to 5.5.17
> > > +- Remove jasper2 subdirectory of jasper from patches and this spec file
> > > +
> > > +* Wed Apr 19 2006 Ralph Apel <r.apel@r-apel.de> 0:5.5.16-3jpp
> > > +- Drop jdtCompilerAdapter from build-jar-repository
> > > +- Use ant-trax in static webapp build
> > > +- Duplicate admin-webapps jars in _javadir and make them world readable
> > > +- Direct install of common-lib and server-lib to _javadir and symlink for TC5
> > > +
> > > +* Tue Apr 04 2006 Ralph Apel <r.apel@r-apel.de> 0:5.5.16-2jpp
> > > +- Require eclipse-ecj >= 3.1.1 and adapt to it
> > > +
> > > +* Fri Mar 24 2006 Ralph Apel <r.apel@r-apel.de> 0:5.5.16-1jpp
> > > +- Upgrade to 5.5.16
> > > +
> > > +* Tue Feb 14 2006 Ralph Apel <r.apel@r-apel.de> 0:5.5.12-2jpp
> > > +- Fix jta.jar location
> > > +
> > > +* Fri Nov 11 2005 Fernando Nasser <fnasser@redhat.com> 0:5.5.12-1jpp
> > > +- Place jsp in its own subpackage
> > > +- Fix alternative links to jsp and servlet
> > > +- Fix alternative priorities to jsp and servlet
> > > +- Create library subpackages: common-lib and server-lib
> > > + From Vadim Nasardinov <vadimn@redhat.com> 0:5.5.12-1jpp
> > > +- Upgrade to 5.5.12
> > > + From Deepak Bhole <dbhole@redhat.com>
> > > +- Fix init script so it works with SELinux
> > > +
> > > +* Wed Jun 08 2005 Fernando Nasser <fnasser@redhat.com> 0:5.5.9-1jpp
> > > +- Merge for upgrade
> > > +- Change the user to tomcat from tomcat4
> > > +- Relax permissions on appdir directory so jonas package can build
> > > +- Remove spurious links to log4j.jar from common and server/lib
> > > +- Remove spurious dependency on tyrex (only needed for tomcat4)
> > > +- Make sure the main package installs first so user tomcat is created
> > > +- Reinstate ssl code changes so that tomcat can be built with other SDKs
> > > + and not only with Sun's or BEA's.
> > > +
> > > +* Mon May 09 2005 Fernando Nasser <fnasser@redhat.com> 0:5.5.9-1jpp
> > > +- Upgrade to 5.5.9
> > > +- Add jmx to bindir and lower requirement to java 1.4.2
> > > +
> > > +* Fri Feb 04 2005 Jason Corley 0:5.5.7-2jpp
> > > +- Add provides servletapi5 in addition to obsoletes servletapi5 (Martin \
> > > Grotzke) +
> > > +* Thu Feb 03 2005 Jason Corley 0:5.5.7-1jpp
> > > +- Upgrade to current stable release, 5.5.7
> > > +
> > > +* Fri Jan 31 2005 Jason Corley 0:5.5.4-17jpp
> > > +- Use new eclipse-ecj package to remove old jasper-compiler-jdt.jar hack
> > > +
> > > +* Thu Jan 27 2005 Jason Corley 0:5.5.4-16jpp
> > > +- Attempt to replace non-free jta with free geronimo-specs
> > > +
> > > +* Thu Jan 27 2005 Jason Corley 0:5.5.4-15jpp
> > > +- Clean rebuild
> > > +
> > > +* Thu Dec 16 2004 Jason Corley 0:5.5.4-14jpp
> > > +- First attempt at jasper subpackages
> > > +
> > > +* Thu Dec 16 2004 Jason Corley 0:5.5.4-13jpp
> > > +- Yet another "servletapi" naming scheme change
> > > +
> > > +* Tue Dec 14 2004 Jason Corley 0:5.5.4-12jpp
> > > +- Update the servletapi and servletapi-javadoc subpackages to the way proposed
> > > + by Gary Benson (based on work by Ralph Apel) in the 5.0.30 RPMs
> > > +
> > > +* Wed Dec 08 2004 Jason Corley 0:5.5.4-10jpp
> > > +- Incorporate Fernando Nasser's javaxssl patch from the tomcat 5.0.28 RPM
> > > +- Replace find ... -exec's with find | xargs
> > > +
> > > +* Tue Dec 07 2004 Jason Corley 0:5.5.4-9jpp
> > > +- First attempt at the whole servletapi issue
> > > +- Replace jmxri references with mx4j
> > > +- Build with JDK 1.4 and require a 1.4 JDK to run
> > > +- Remove cruft
> > > +- Clearly lost track of some stuff between changelog entries ;-)
> > >
> > > -* Wed Jul 20 2005 Gary Benson <gbenson@redhat.com> 0:5.0.30-7jpp
> > > -- Remove references to the never used commons-daemon.
> > > -- Remove an unused patch and a couple of comments.
> > > -- Add a runtime dependency on puretls.
> > > -- Build webapps in build not install.
> > > -- Correct ant-launcher path in first set of build.properties.
> > > -- Explicitly specify which mx4j jars to use at all times.
> > > -- Don't include jars from other rpms in %{bindir}.
> > > -- Correct permissions and remove junk from %{bindir}.
> > > -- Add ant-launcher.jar to common classloader.
> > > -- s/tomcat4/tomcat5/ in various comments.
> > > -
> > > -* Mon Apr 11 2005 Florian La Roche <laroche@redhat.com>
> > > -- /etc/init.d -> /etc/rc.d/init.d.
> > > -
> > > -* Mon Feb 14 2005 Jason Corley <jason.corley@gmail.com> 0:5.0.30-6jpp
> > > -- Migrate to current struts
> > > -
> > > -* Tue Feb 02 2005 Jason Corley <jason.corley@gmail.com> 0:5.0.30-5jpp
> > > -- Fix jasper symlinks in /var/lib/tomcat5/common/lib (discovered by Kaj Niemi)
> > > -
> > > -* Fri Jan 21 2005 Jason Corley <jason.corley@gmail.com> 0:5.0.30-4jpp
> > > -- Add patch to remove Manifest from bootstrap.jar
> > > -- Add patch to fix mx4j/mx4j 2 differences
> > > -
> > > -* Mon Jan 10 2005 Gary Benson <gbenson@redhat.com> 0:5.0.30-3jpp
> > > -- Create the jasper5 and jasper5-javadoc replacement packages.
> > > -
> > > -* Wed Jan 05 2005 Gary Benson <gbenson@redhat.com>
> > > -- Add omitted uninstall scriptlet for tomcat5-servlet-2.4-api-javadoc.
> > > -
> > > -* Mon Dec 20 2004 Gary Benson <gbenson@redhat.com> 0:5.0.30-2jpp
> > > -- Create the servletapi5 and servletapi5-javadoc replacement packages.
> > > - Partly from Ralph Apel <R.Apel@t-systems.com>.
> > > -
> > > -* Thu Dec 09 2004 Gary Benson <gbenson@redhat.com> 0:5.0.30-1jpp
> > > -- Update to 5.0.30
> > > -
> > > -* Wed Dec 08 2004 Fernando Nasser <fnasser@redhat.com> 0:5.0.28-2jpp
> > > -- Update dependency to struts11 as this version does not build with
> > > - the new Struts
> > > -- Remove SDK 1.3-related references to com.sun.* classes so it can
> > > - build with other Java providers
> > > -
> > > -* Tue Nov 23 2004 Jason Corley 0:5.0.28-1jpp
> > > -- Update to 5.0.28
> > > -- Add JDK build and runtime dependency (1.4 or newer)
> > > -- Update jpackage-utils dependency to 1.6.0 or newer
> > > -- Require jakarta-commons-beanutils 1.7.0 or newer (release notes 5.0.28)
> > > -- Require jakarta-commons-collections 3.1 or newer (release notes 5.0.28)
> > > -- Require jakarta-commons-pool 1.2 or newer (release notes 5.0.27)
> > > +* Fri Dec 03 2004 Jason Corley 0:5.5.4-1jpp
> > > +- First attempt at building 5.5
> > >
> > > * Fri Sep 10 2004 Fernando Nasser <fnasser@redhat.com> 0:5.0.27-4jpp
> > > - Rebuild using Tyrex 1.0.1
> > >
> > >
> > > _______________________________________________
> > > JPackage-announce mailing list
> > > JPackage-announce@zarb.org
> > > https://www.zarb.org/mailman/listinfo/jpackage-announce
> > >
> >
> >
> > --
> > Will Tatam
> > Systems Architect
> > Red61
> >
> > 0845 867 2203 ext 103
> >
> > _______________________________________________
> > JPackage-discuss mailing list
> > JPackage-discuss@zarb.org
> > https://www.zarb.org/mailman/listinfo/jpackage-discuss
> >
> _______________________________________________
> JPackage-discuss mailing list
> JPackage-discuss@zarb.org
> https://www.zarb.org/mailman/listinfo/jpackage-discuss
> _______________________________________________
> JPackage-discuss mailing list
> JPackage-discuss@zarb.org
> https://www.zarb.org/mailman/listinfo/jpackage-discuss
>
_______________________________________________
JPackage-discuss mailing list
JPackage-discuss@zarb.org
https://www.zarb.org/mailman/listinfo/jpackage-discuss
_______________________________________________
JPackage-discuss mailing list
JPackage-discuss@zarb.org
https://www.zarb.org/mailman/listinfo/jpackage-discuss
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic