2008-04-07 22:37:26 +00:00
|
|
|
# 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.
|
|
|
|
#
|
|
|
|
|
2010-03-29 17:59:55 +00:00
|
|
|
%global section free
|
2008-04-07 22:37:26 +00:00
|
|
|
|
2010-03-29 17:59:55 +00:00
|
|
|
%global jspspec 2.1
|
|
|
|
%global major_version 6
|
|
|
|
%global minor_version 0
|
|
|
|
%global micro_version 26
|
|
|
|
%global packdname apache-tomcat-%{version}-src
|
|
|
|
%global servletspec 2.5
|
2010-06-29 21:51:36 +00:00
|
|
|
%global elspec 2.1
|
2010-03-29 17:59:55 +00:00
|
|
|
%global tcuid 91
|
2008-04-07 22:37:26 +00:00
|
|
|
|
|
|
|
# FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/
|
2010-03-29 17:59:55 +00:00
|
|
|
%global basedir %{_var}/lib/%{name}
|
|
|
|
%global appdir %{basedir}/webapps
|
|
|
|
%global bindir %{_datadir}/%{name}/bin
|
|
|
|
%global confdir %{_sysconfdir}/%{name}
|
|
|
|
%global homedir %{_datadir}/%{name}
|
|
|
|
%global libdir %{_javadir}/%{name}
|
|
|
|
%global logdir %{_var}/log/%{name}
|
|
|
|
%global cachedir %{_var}/cache/%{name}
|
|
|
|
%global tempdir %{cachedir}/temp
|
|
|
|
%global workdir %{cachedir}/work
|
|
|
|
%global _initrddir %{_sysconfdir}/init.d
|
2008-04-07 22:37:26 +00:00
|
|
|
|
|
|
|
Name: tomcat6
|
|
|
|
Epoch: 0
|
2008-09-05 17:14:04 +00:00
|
|
|
Version: %{major_version}.%{minor_version}.%{micro_version}
|
2010-12-02 14:04:43 +00:00
|
|
|
Release: 15%{?dist}
|
2008-04-07 22:37:26 +00:00
|
|
|
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
|
|
|
|
|
|
|
|
Group: Networking/Daemons
|
|
|
|
License: ASL 2.0
|
|
|
|
URL: http://tomcat.apache.org/
|
|
|
|
Source0: http://www.apache.org/dist/tomcat/tomcat-6/v%{version}/src/%{packdname}.tar.gz
|
|
|
|
Source1: %{name}-%{major_version}.%{minor_version}.conf
|
|
|
|
Source2: %{name}-%{major_version}.%{minor_version}.init
|
|
|
|
Source3: %{name}-%{major_version}.%{minor_version}.sysconfig
|
|
|
|
Source4: %{name}-%{major_version}.%{minor_version}.wrapper
|
|
|
|
Source5: %{name}-%{major_version}.%{minor_version}.logrotate
|
|
|
|
Source6: %{name}-%{major_version}.%{minor_version}-digest.script
|
|
|
|
Source7: %{name}-%{major_version}.%{minor_version}-tool-wrapper.script
|
2009-04-01 20:29:13 +00:00
|
|
|
Source8: servlet-api-OSGi-MANIFEST.MF
|
2010-03-01 14:44:21 +00:00
|
|
|
Source9: jsp-api-OSGi-MANIFEST.MF
|
2010-06-29 21:51:36 +00:00
|
|
|
Source10: %{name}-%{major_version}.%{minor_version}-log4j.properties
|
2008-04-07 22:37:26 +00:00
|
|
|
Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
|
|
|
|
Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
|
2010-10-05 15:34:55 +00:00
|
|
|
Patch2: %{name}-%{major_version}.%{minor_version}-CVE-2010-2227.patch
|
2008-04-07 22:37:26 +00:00
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
|
BuildArch: noarch
|
|
|
|
BuildRequires: ant
|
2010-10-05 15:34:55 +00:00
|
|
|
BuildRequires: ant-nodeps
|
2008-09-05 17:14:04 +00:00
|
|
|
BuildRequires: ecj
|
2008-04-07 22:37:26 +00:00
|
|
|
BuildRequires: findutils
|
|
|
|
BuildRequires: jakarta-commons-collections
|
2010-10-14 20:11:37 +00:00
|
|
|
#BuildRequires: jakarta-commons-collections-tomcat5
|
2008-04-07 22:37:26 +00:00
|
|
|
BuildRequires: jakarta-commons-daemon
|
2010-10-14 20:11:37 +00:00
|
|
|
#BuildRequires: jakarta-commons-dbcp-tomcat5
|
|
|
|
#BuildRequires: jakarta-commons-pool-tomcat5
|
|
|
|
BuildRequires: jakarta-commons-dbcp
|
|
|
|
BuildRequires: jakarta-commons-pool
|
2010-04-06 19:02:40 +00:00
|
|
|
BuildRequires: jakarta-taglibs-standard
|
2008-10-13 20:37:31 +00:00
|
|
|
BuildRequires: java-1.6.0-devel
|
2008-04-07 22:37:26 +00:00
|
|
|
BuildRequires: jpackage-utils >= 0:1.7.0
|
|
|
|
BuildRequires: junit
|
2010-06-29 21:51:36 +00:00
|
|
|
BuildRequires: log4j
|
2008-04-07 22:37:26 +00:00
|
|
|
Requires(pre): shadow-utils
|
|
|
|
Requires(pre): shadow-utils
|
|
|
|
Requires: jakarta-commons-daemon
|
|
|
|
Requires: jakarta-commons-logging
|
2010-06-29 21:51:36 +00:00
|
|
|
Requires: jakarta-commons-collections
|
2008-10-13 20:37:31 +00:00
|
|
|
Requires: java-1.6.0
|
2008-04-07 22:37:26 +00:00
|
|
|
Requires: procps
|
|
|
|
Requires: %{name}-lib = %{epoch}:%{version}-%{release}
|
2008-10-13 20:15:33 +00:00
|
|
|
Requires(post): /sbin/chkconfig
|
|
|
|
Requires(preun): /sbin/chkconfig
|
|
|
|
Requires(post): /lib/lsb/init-functions
|
|
|
|
Requires(preun): /lib/lsb/init-functions
|
2010-03-26 17:07:32 +00:00
|
|
|
Requires(post): jpackage-utils
|
|
|
|
Requires(postun): jpackage-utils
|
2008-04-07 22:37:26 +00:00
|
|
|
|
|
|
|
%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 version 2.0. Tomcat is intended
|
|
|
|
to be a collaboration of the best-of-breed developers from around the world.
|
|
|
|
|
|
|
|
%package admin-webapps
|
|
|
|
Group: System Environment/Applications
|
|
|
|
Summary: The host-manager and manager web applications for Apache Tomcat
|
|
|
|
Requires: %{name} = %{epoch}:%{version}-%{release}
|
|
|
|
|
|
|
|
%description admin-webapps
|
2008-09-05 17:14:04 +00:00
|
|
|
The host-manager and manager web applications for Apache Tomcat.
|
2008-04-07 22:37:26 +00:00
|
|
|
|
|
|
|
%package docs-webapp
|
|
|
|
Group: System Environment/Applications
|
|
|
|
Summary: The docs web application for Apache Tomcat
|
|
|
|
Requires: %{name} = %{epoch}:%{version}-%{release}
|
|
|
|
|
|
|
|
%description docs-webapp
|
2008-09-05 17:14:04 +00:00
|
|
|
The docs web application for Apache Tomcat.
|
2008-04-07 22:37:26 +00:00
|
|
|
|
|
|
|
%package javadoc
|
|
|
|
Group: Documentation
|
|
|
|
Summary: Javadoc generated documentation for Apache Tomcat
|
|
|
|
|
|
|
|
%description javadoc
|
2008-09-05 17:14:04 +00:00
|
|
|
Javadoc generated documentation for Apache Tomcat.
|
2008-04-07 22:37:26 +00:00
|
|
|
|
|
|
|
%package jsp-%{jspspec}-api
|
|
|
|
Group: Internet/WWW/Dynamic Content
|
|
|
|
Summary: Apache Tomcat JSP API implementation classes
|
|
|
|
Provides: jsp = %{jspspec}
|
|
|
|
Provides: jsp21
|
|
|
|
Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
|
2008-12-02 16:26:49 +00:00
|
|
|
Requires(post): %{_sbindir}/update-alternatives
|
|
|
|
Requires(postun): %{_sbindir}/update-alternatives
|
2008-04-07 22:37:26 +00:00
|
|
|
|
|
|
|
%description jsp-%{jspspec}-api
|
2008-09-05 17:14:04 +00:00
|
|
|
Apache Tomcat JSP API implementation classes.
|
2008-04-07 22:37:26 +00:00
|
|
|
|
2010-06-29 21:51:36 +00:00
|
|
|
|
|
|
|
%package log4j
|
|
|
|
Group: Internet/WWW/Dynamic Content
|
|
|
|
Summary: Log4j support for Apache Tomcat
|
|
|
|
Requires: jakarta-commons-logging
|
|
|
|
|
|
|
|
%description log4j
|
|
|
|
Log4j support for Apache Tomcat
|
|
|
|
|
2008-04-07 22:37:26 +00:00
|
|
|
%package lib
|
|
|
|
Group: Development/Compilers
|
|
|
|
Summary: Libraries needed to run the Tomcat Web container
|
|
|
|
Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release}
|
|
|
|
Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
|
2010-06-29 21:51:36 +00:00
|
|
|
Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release}
|
2010-04-06 19:02:40 +00:00
|
|
|
Requires: ecj
|
2010-10-14 20:11:37 +00:00
|
|
|
Requires: jakarta-commons-collections
|
|
|
|
Requires: jakarta-commons-dbcp
|
|
|
|
Requires: jakarta-commons-pool
|
2008-04-07 22:37:26 +00:00
|
|
|
Requires(preun): coreutils
|
|
|
|
|
|
|
|
%description lib
|
2008-09-05 17:14:04 +00:00
|
|
|
Libraries needed to run the Tomcat Web container.
|
2008-04-07 22:37:26 +00:00
|
|
|
|
|
|
|
%package servlet-%{servletspec}-api
|
|
|
|
Group: Internet/WWW/Dynamic Content
|
|
|
|
Summary: Apache Tomcat Servlet API implementation classes
|
|
|
|
Provides: servlet = %{servletspec}
|
|
|
|
Provides: servlet6
|
|
|
|
Provides: servlet25
|
2008-12-02 16:26:49 +00:00
|
|
|
Requires(post): %{_sbindir}/update-alternatives
|
|
|
|
Requires(postun): %{_sbindir}/update-alternatives
|
2008-04-07 22:37:26 +00:00
|
|
|
|
|
|
|
%description servlet-%{servletspec}-api
|
2008-09-05 17:14:04 +00:00
|
|
|
Apache Tomcat Servlet API implementation classes.
|
2008-04-07 22:37:26 +00:00
|
|
|
|
2010-06-29 21:51:36 +00:00
|
|
|
%package el-%{elspec}-api
|
|
|
|
Group: Development/Libraries/Java
|
|
|
|
Summary: Expression Language v1.0 API
|
|
|
|
Provides: el_1_0_api = %{epoch}:%{version}-%{release}
|
|
|
|
Provides: el_api = %{elspec}
|
|
|
|
Requires(post): %{_sbindir}/update-alternatives
|
|
|
|
Requires(postun): %{_sbindir}/update-alternatives
|
|
|
|
|
|
|
|
%description el-%{elspec}-api
|
|
|
|
Expression Language 1.0.
|
|
|
|
|
2008-04-07 22:37:26 +00:00
|
|
|
%package webapps
|
|
|
|
Group: System Environment/Applications
|
|
|
|
Summary: The ROOT and examples web applications for Apache Tomcat
|
|
|
|
Requires: %{name} = %{epoch}:%{version}-%{release}
|
2010-04-06 19:02:40 +00:00
|
|
|
Requires: jakarta-taglibs-standard >= 0:1.1
|
2008-04-07 22:37:26 +00:00
|
|
|
|
|
|
|
%description webapps
|
2008-09-05 17:14:04 +00:00
|
|
|
The ROOT and examples web applications for Apache Tomcat.
|
2008-04-07 22:37:26 +00:00
|
|
|
|
|
|
|
%prep
|
|
|
|
%setup -q -c -T -a 0
|
|
|
|
# remove pre-built binaries and windows files
|
2008-09-05 17:14:04 +00:00
|
|
|
find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \
|
2010-06-29 21:51:36 +00:00
|
|
|
-name "*.jar" -o -name "*.war" -o -name "*.zip" \) | xargs -t %{__rm}
|
2008-09-05 17:14:04 +00:00
|
|
|
pushd %{packdname}
|
2008-04-07 22:37:26 +00:00
|
|
|
%patch0 -p0
|
|
|
|
%patch1 -p0
|
2010-10-05 15:34:55 +00:00
|
|
|
%patch2 -p0
|
2010-06-29 21:51:36 +00:00
|
|
|
%{__ln_s} $(build-classpath jakarta-taglibs-core) webapps/examples/WEB-INF/lib/jstl.jar
|
|
|
|
%{__ln_s} $(build-classpath jakarta-taglibs-standard) webapps/examples/WEB-INF/lib/standard.jar
|
2008-09-05 17:14:04 +00:00
|
|
|
popd
|
2008-04-07 22:37:26 +00:00
|
|
|
|
|
|
|
%build
|
|
|
|
export CLASSPATH=
|
2010-10-05 15:34:55 +00:00
|
|
|
export OPT_JAR_LIST="ant/ant-nodeps"
|
2008-04-07 22:37:26 +00:00
|
|
|
pushd %{packdname}
|
2010-06-29 21:51:36 +00:00
|
|
|
# we don't care about the tarballs and we're going to replace
|
|
|
|
# tomcat-dbcp.jar with jakarta-commons-{collections,dbcp,pool}-tomcat5.jar
|
|
|
|
# so just create a dummy file for later removal
|
|
|
|
touch HACK
|
|
|
|
# who needs a build.properties file anyway
|
|
|
|
%{ant} -Dbase.path="." \
|
|
|
|
-Dbuild.compiler="modern" \
|
2010-10-14 20:11:37 +00:00
|
|
|
-Dcommons-collections.jar="$(build-classpath jakarata-commons-collections)" \
|
2010-06-29 21:51:36 +00:00
|
|
|
-Dcommons-daemon.jar="$(build-classpath commons-daemon)" \
|
|
|
|
-Dcommons-daemon.jsvc.tar.gz="HACK" \
|
|
|
|
-Djasper-jdt.jar="$(build-classpath ecj)" \
|
|
|
|
-Djdt.jar="$(build-classpath ecj)" \
|
2010-10-14 20:11:37 +00:00
|
|
|
-Dtomcat-dbcp.jar="$(build-classpath commons-dbcp)" \
|
2010-06-29 21:51:36 +00:00
|
|
|
-Dtomcat-native.tar.gz="HACK" \
|
|
|
|
-Dversion="%{version}" \
|
|
|
|
-Dversion.build="%{micro_version}"
|
|
|
|
# javadoc generation
|
|
|
|
%{ant} -f dist.xml dist-prepare
|
|
|
|
%{ant} -f dist.xml dist-source
|
|
|
|
%{ant} -f dist.xml dist-javadoc
|
2008-04-07 22:37:26 +00:00
|
|
|
# remove some jars that we'll replace with symlinks later
|
2010-06-29 21:51:36 +00:00
|
|
|
%{__rm} output/build/bin/commons-daemon.jar \
|
|
|
|
output/build/lib/ecj.jar
|
2008-04-07 22:37:26 +00:00
|
|
|
# remove the cruft we created
|
2010-06-29 21:51:36 +00:00
|
|
|
%{__rm} output/build/bin/HACK \
|
2010-10-14 20:11:37 +00:00
|
|
|
output/build/bin/tomcat-native.tar.gz
|
2008-04-07 22:37:26 +00:00
|
|
|
popd
|
|
|
|
pushd %{packdname}/output/dist/src/webapps/docs/appdev/sample/src
|
|
|
|
%{__mkdir_p} ../web/WEB-INF/classes
|
|
|
|
%{javac} -cp ../../../../../../../../output/build/lib/servlet-api.jar -d ../web/WEB-INF/classes mypackage/Hello.java
|
|
|
|
pushd ../web
|
|
|
|
%{jar} cf ../../../../../../../../output/build/webapps/docs/appdev/sample/sample.war *
|
|
|
|
popd
|
|
|
|
popd
|
|
|
|
|
2009-04-01 20:29:13 +00:00
|
|
|
# inject OSGi manifests
|
|
|
|
mkdir -p META-INF
|
|
|
|
cp -p %{SOURCE8} META-INF/MANIFEST.MF
|
|
|
|
touch META-INF/MANIFEST.MF
|
|
|
|
zip -u %{packdname}/output/build/lib/servlet-api.jar META-INF/MANIFEST.MF
|
2010-03-01 14:44:21 +00:00
|
|
|
cp -p %{SOURCE9} META-INF/MANIFEST.MF
|
|
|
|
touch META-INF/MANIFEST.MF
|
|
|
|
zip -u %{packdname}/output/build/lib/jsp-api.jar META-INF/MANIFEST.MF
|
2009-04-01 20:29:13 +00:00
|
|
|
|
2008-04-07 22:37:26 +00:00
|
|
|
%install
|
|
|
|
%{__rm} -rf $RPM_BUILD_ROOT
|
|
|
|
# build initial path structure
|
|
|
|
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_bindir}
|
|
|
|
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sbindir}
|
|
|
|
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}
|
|
|
|
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_initrddir}
|
|
|
|
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d
|
|
|
|
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
|
|
|
|
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{appdir}
|
|
|
|
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{bindir}
|
2010-06-29 21:51:36 +00:00
|
|
|
%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{confdir}
|
|
|
|
%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{confdir}/Catalina/localhost
|
2008-04-07 22:37:26 +00:00
|
|
|
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{libdir}
|
2010-06-29 21:51:36 +00:00
|
|
|
%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{logdir}
|
|
|
|
%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{homedir}
|
|
|
|
%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{tempdir}
|
|
|
|
%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{workdir}
|
2010-03-29 17:59:55 +00:00
|
|
|
|
2008-04-07 22:37:26 +00:00
|
|
|
# move things into place
|
2010-03-29 17:59:55 +00:00
|
|
|
# First copy supporting libs to tomcat lib
|
2008-04-07 22:37:26 +00:00
|
|
|
pushd %{packdname}/output/build
|
|
|
|
%{__cp} -a bin/*.{jar,xml} ${RPM_BUILD_ROOT}%{bindir}
|
2010-06-29 21:51:36 +00:00
|
|
|
%{__cp} %{SOURCE10} conf/log4j.properties
|
2008-04-07 22:37:26 +00:00
|
|
|
%{__cp} -a conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{confdir}
|
|
|
|
%{__cp} -a lib/*.jar ${RPM_BUILD_ROOT}%{libdir}
|
|
|
|
%{__cp} -a webapps/* ${RPM_BUILD_ROOT}%{appdir}
|
|
|
|
popd
|
|
|
|
# javadoc
|
|
|
|
pushd %{packdname}/output/dist/webapps
|
|
|
|
%{__cp} -a docs/api/* ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}
|
|
|
|
popd
|
|
|
|
%{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
|
2010-06-29 21:51:36 +00:00
|
|
|
-e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
|
|
|
|
-e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE1} \
|
2008-04-07 22:37:26 +00:00
|
|
|
> ${RPM_BUILD_ROOT}%{confdir}/%{name}.conf
|
|
|
|
%{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
|
2010-06-29 21:51:36 +00:00
|
|
|
-e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
|
|
|
|
-e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE3} \
|
2008-04-07 22:37:26 +00:00
|
|
|
> ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name}
|
|
|
|
%{__install} -m 0644 %{SOURCE2} \
|
|
|
|
${RPM_BUILD_ROOT}%{_initrddir}/%{name}
|
|
|
|
%{__install} -m 0644 %{SOURCE4} \
|
|
|
|
${RPM_BUILD_ROOT}%{_sbindir}/%{name}
|
|
|
|
%{__ln_s} %{name} ${RPM_BUILD_ROOT}%{_sbindir}/d%{name}
|
|
|
|
%{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE5} \
|
|
|
|
> ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}
|
|
|
|
%{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
|
2010-06-29 21:51:36 +00:00
|
|
|
-e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
|
|
|
|
-e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE6} \
|
2008-04-07 22:37:26 +00:00
|
|
|
> ${RPM_BUILD_ROOT}%{_bindir}/%{name}-digest
|
|
|
|
%{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
|
2010-06-29 21:51:36 +00:00
|
|
|
-e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
|
|
|
|
-e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE7} \
|
2008-04-07 22:37:26 +00:00
|
|
|
> ${RPM_BUILD_ROOT}%{_bindir}/%{name}-tool-wrapper
|
|
|
|
# create jsp and servlet API symlinks
|
|
|
|
pushd ${RPM_BUILD_ROOT}%{_javadir}
|
2010-06-29 21:51:36 +00:00
|
|
|
%{__mv} %{name}/jsp-api.jar %{name}-jsp-%{jspspec}-api-%{version}.jar
|
|
|
|
%{__mv} %{name}/servlet-api.jar \
|
|
|
|
%{name}-servlet-%{servletspec}-api-%{version}.jar
|
|
|
|
%{__mv} %{name}/el-api.jar %{name}-el-%{elspec}-api-%{version}.jar
|
|
|
|
%{__ln_s} %{name}-jsp-%{jspspec}-api-%{version}.jar \
|
|
|
|
%{name}-jsp-%{jspspec}-api.jar
|
|
|
|
%{__ln_s} %{name}-servlet-%{servletspec}-api-%{version}.jar \
|
|
|
|
%{name}-servlet-%{servletspec}-api.jar
|
|
|
|
%{__ln_s} %{name}-el-%{elspec}-api-%{version}.jar %{name}-el-%{elspec}-api.jar
|
2008-04-07 22:37:26 +00:00
|
|
|
popd
|
2010-04-08 23:50:29 +00:00
|
|
|
|
|
|
|
pushd %{packdname}/output/build
|
2010-10-14 20:11:37 +00:00
|
|
|
%{_bindir}/build-jar-repository lib commons-collections \
|
|
|
|
commons-dbcp commons-pool ecj 2>&1
|
2010-04-08 23:50:29 +00:00
|
|
|
# need to use -p here with b-j-r otherwise the examples webapp fails to
|
|
|
|
# load with a java.io.IOException
|
|
|
|
%{_bindir}/build-jar-repository -p webapps/examples/WEB-INF/lib \
|
|
|
|
taglibs-core.jar taglibs-standard.jar 2>&1
|
|
|
|
popd
|
|
|
|
|
2008-04-07 22:37:26 +00:00
|
|
|
pushd ${RPM_BUILD_ROOT}%{libdir}
|
2010-06-29 21:51:36 +00:00
|
|
|
# fix up jars to include version number
|
|
|
|
for i in *.jar; do
|
|
|
|
j="$(echo $i | %{__sed} -e 's,\.jar$,,')"
|
|
|
|
%{__mv} ${j}.jar ${j}-%{version}.jar
|
|
|
|
%{__ln_s} ${j}-%{version}.jar ${j}.jar
|
2008-04-07 22:37:26 +00:00
|
|
|
done
|
|
|
|
# symlink JSP and servlet API jars
|
|
|
|
%{__ln_s} ../%{name}-jsp-%{jspspec}-api-%{version}.jar .
|
|
|
|
%{__ln_s} ../%{name}-servlet-%{servletspec}-api-%{version}.jar .
|
2010-06-29 21:51:36 +00:00
|
|
|
%{__ln_s} ../%{name}-el-%{elspec}-api-%{version}.jar
|
2010-10-14 20:11:37 +00:00
|
|
|
%{__cp} -p $(build-classpath commons-collections) .
|
2010-06-29 21:51:36 +00:00
|
|
|
%{__cp} -p $(build-classpath log4j) .
|
2010-12-02 14:04:43 +00:00
|
|
|
%{__ln_s} log4j.jar log4j-%{version}.jar
|
2010-10-14 20:11:37 +00:00
|
|
|
# %{__ln_s} $(build-classpath commons-dbcp) .
|
|
|
|
# %{__ln_s} $(build-classpath commons-pool) .
|
2010-06-29 21:51:36 +00:00
|
|
|
%{__ln_s} $(build-classpath ecj) jasper-jdt.jar
|
2008-04-07 22:37:26 +00:00
|
|
|
popd
|
|
|
|
pushd ${RPM_BUILD_ROOT}%{bindir}
|
2010-06-29 21:51:36 +00:00
|
|
|
# fix up jars to include version number
|
|
|
|
for i in *.jar; do
|
|
|
|
j="$(echo $i | %{__sed} -e 's,\.jar$,,')"
|
|
|
|
%{__mv} ${j}.jar ${j}-%{version}.jar
|
|
|
|
%{__ln_s} ${j}-%{version}.jar ${j}.jar
|
|
|
|
done
|
2008-04-07 22:37:26 +00:00
|
|
|
popd
|
|
|
|
# symlink to the FHS locations where we've installed things
|
|
|
|
pushd ${RPM_BUILD_ROOT}%{homedir}
|
|
|
|
%{__ln_s} %{appdir} webapps
|
|
|
|
%{__ln_s} %{confdir} conf
|
|
|
|
%{__ln_s} %{libdir} lib
|
|
|
|
%{__ln_s} %{logdir} logs
|
|
|
|
%{__ln_s} %{tempdir} temp
|
|
|
|
%{__ln_s} %{workdir} work
|
|
|
|
popd
|
|
|
|
|
|
|
|
# install sample webapp
|
|
|
|
%{__mkdir_p} ${RPM_BUILD_ROOT}%{appdir}/sample
|
|
|
|
pushd ${RPM_BUILD_ROOT}%{appdir}/sample
|
|
|
|
%{jar} xf ${RPM_BUILD_ROOT}%{appdir}/docs/appdev/sample/sample.war
|
|
|
|
popd
|
|
|
|
%{__rm} ${RPM_BUILD_ROOT}%{appdir}/docs/appdev/sample/sample.war
|
|
|
|
|
2010-03-26 17:12:38 +00:00
|
|
|
# Link the juli jars into /usr/share/java/tomcat6
|
|
|
|
pushd ${RPM_BUILD_ROOT}%{libdir}
|
|
|
|
%{__ln_s} %{bindir}/tomcat-juli* .
|
|
|
|
popd
|
|
|
|
|
2010-11-09 15:37:01 +00:00
|
|
|
# Generate a depmap fragment javax.servlet:servlet-api pointing to
|
|
|
|
# tomcat6-servlet-2.5-api for backwards compatibility
|
|
|
|
%add_to_maven_depmap javax.servlet servlet-api %{servletspec} JPP %{name}-servlet-%{servletspec}-api
|
|
|
|
mv %{buildroot}%{_mavendepmapfragdir}/%{name} %{buildroot}%{_mavendepmapfragdir}/%{name}-servlet-api
|
|
|
|
|
2010-03-26 17:07:32 +00:00
|
|
|
# Install the maven metadata
|
|
|
|
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_mavenpomdir}
|
|
|
|
pushd %{packdname}/output/dist/src/res/maven
|
2010-12-02 16:04:52 +00:00
|
|
|
for pom in *.pom; do
|
|
|
|
# fix-up version in all pom files
|
|
|
|
sed -i 's/@MAVEN.DEPLOY.VERSION@/%{version}/g' $pom
|
2010-03-26 17:07:32 +00:00
|
|
|
done
|
|
|
|
|
2010-12-02 16:04:52 +00:00
|
|
|
# we won't install dbcp, juli-adapters and juli-extras pom files
|
|
|
|
for pom in annotations-api.pom catalina.pom jasper-el.pom jasper.pom \
|
|
|
|
catalina-ha.pom el-api.pom jasper-jdt.pom; do
|
|
|
|
%{__cp} -a $pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-$pom
|
|
|
|
base=`basename $pom .pom`
|
|
|
|
%add_to_maven_depmap org.apache.tomcat $base %{version} JPP/%{name} $base
|
|
|
|
done
|
|
|
|
|
|
|
|
# servlet-api jsp-api and el-api are not in tomcat6 subdir, since they are widely re-used elsewhere
|
|
|
|
for pom in jsp-api.pom servlet-api.pom el-api.pom;do
|
|
|
|
%{__cp} -a $pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-%{name}-$pom
|
|
|
|
base=`basename $pom .pom`
|
|
|
|
%add_to_maven_depmap org.apache.tomcat $base %{version} JPP %{name}-$base
|
|
|
|
done
|
|
|
|
|
|
|
|
# two special pom where jar files have different names
|
|
|
|
%{__cp} -a tribes.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom
|
|
|
|
%add_to_maven_depmap org.apache.tomcat tribes %{version} JPP/%{name} catalina-tribes
|
|
|
|
|
|
|
|
%{__cp} -a juli.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom
|
|
|
|
%add_to_maven_depmap org.apache.tomcat juli %{version} JPP/%{name} tomcat-juli
|
|
|
|
|
2010-03-26 17:07:32 +00:00
|
|
|
|
2008-04-07 22:37:26 +00:00
|
|
|
%clean
|
|
|
|
%{__rm} -rf $RPM_BUILD_ROOT
|
|
|
|
|
2010-12-01 16:47:50 +00:00
|
|
|
|
2008-04-07 22:37:26 +00:00
|
|
|
%pre
|
|
|
|
# add the tomcat user and group
|
|
|
|
%{_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 || :
|
2010-12-01 16:47:50 +00:00
|
|
|
# Save the conf, app, and lib dirs
|
|
|
|
# due to rbgz 640686. Copy them to the _tmppath so we don't pollute
|
|
|
|
# the tomcat file structure
|
|
|
|
[ -d %{appdir} ] && %{__cp} -rp %{appdir} %{_tmppath}/%{name}-webapps.bak || :
|
|
|
|
[ -d %{confdir} ] && %{__cp} -rp %{confdir} %{_tmppath}/%{name}-confdir.bak || :
|
|
|
|
[ -d %{libdir} ] && %{__cp} -rp %{libdir} %{_tmppath}/%{name}-libdir.bak || :
|
2008-04-07 22:37:26 +00:00
|
|
|
|
|
|
|
%post
|
|
|
|
# install but don't activate
|
|
|
|
/sbin/chkconfig --add %{name}
|
2010-03-26 17:07:32 +00:00
|
|
|
%update_maven_depmap
|
2008-04-07 22:37:26 +00:00
|
|
|
|
|
|
|
%post jsp-%{jspspec}-api
|
|
|
|
%{_sbindir}/update-alternatives --install %{_javadir}/jsp.jar jsp \
|
|
|
|
%{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20100
|
|
|
|
|
2010-03-29 17:59:55 +00:00
|
|
|
#%post lib
|
|
|
|
#%{_bindir}/build-jar-repository %{libdir} commons-collections-tomcat5 \
|
|
|
|
# commons-dbcp-tomcat5 commons-pool-tomcat5 ecj 2>&1
|
2008-04-07 22:37:26 +00:00
|
|
|
|
|
|
|
%post servlet-%{servletspec}-api
|
|
|
|
%{_sbindir}/update-alternatives --install %{_javadir}/servlet.jar servlet \
|
|
|
|
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar 20500
|
2010-11-09 15:37:01 +00:00
|
|
|
%update_maven_depmap
|
2008-04-07 22:37:26 +00:00
|
|
|
|
2010-06-29 21:51:36 +00:00
|
|
|
%post el-%{elspec}-api
|
2010-07-01 18:04:47 +00:00
|
|
|
%{_sbindir}/update-alternatives --install %{_javadir}/elspec.jar elspec \
|
2010-06-29 21:51:36 +00:00
|
|
|
%{_javadir}/%{name}-el-%{elspec}-api.jar 20250
|
|
|
|
|
2010-03-29 17:59:55 +00:00
|
|
|
#%post webapps
|
2010-03-01 14:44:21 +00:00
|
|
|
# need to use -p here with b-j-r otherwise the examples webapp fails to
|
|
|
|
# load with a java.io.IOException
|
2010-03-29 17:59:55 +00:00
|
|
|
#%{_bindir}/build-jar-repository -p %{appdir}/examples/WEB-INF/lib \
|
|
|
|
# taglibs-core.jar taglibs-standard.jar 2>&1
|
2008-04-07 22:37:26 +00:00
|
|
|
|
2010-12-01 16:47:50 +00:00
|
|
|
# move the temporary backups to the correct tomcat directory
|
|
|
|
# due to rhbz 640686
|
|
|
|
%posttrans
|
|
|
|
if [ -d %{_tmppath}/%{name}-webapps.bak ]; then
|
|
|
|
%{__cp} -rp %{_tmppath}/%{name}-webapps.bak/* %{appdir}
|
|
|
|
%{__rm} -rf %{_tmppath}/%{name}-webapps.bak
|
|
|
|
fi
|
|
|
|
if [ -d %{_tmppath}/%{name}-libdir.bak ]; then
|
|
|
|
%{__cp} -rp %{_tmppath}/%{name}-libdir.bak/* %{libdir}
|
|
|
|
%{__rm} -rf %{_tmppath}/%{name}-libdir.bak
|
|
|
|
fi
|
|
|
|
if [ -d %{_tmppath}/%{name}-confdir.bak ]; then
|
|
|
|
%{__cp} -rp %{_tmppath}/%{name}-confdir.bak/* %{confdir}
|
|
|
|
%{__rm} -rf %{_tmppath}/%{name}-confdir.bak
|
|
|
|
fi
|
|
|
|
|
2008-04-07 22:37:26 +00:00
|
|
|
%preun
|
|
|
|
# clean tempdir and workdir on removal or upgrade
|
2010-06-29 21:51:36 +00:00
|
|
|
%{__rm} -rf %{workdir} %{tempdir}
|
2008-04-07 22:37:26 +00:00
|
|
|
if [ "$1" = "0" ]; then
|
2008-10-13 20:15:33 +00:00
|
|
|
%{_initrddir}/%{name} stop >/dev/null 2>&1
|
2008-04-07 22:37:26 +00:00
|
|
|
/sbin/chkconfig --del %{name}
|
|
|
|
fi
|
|
|
|
|
2010-03-29 17:59:55 +00:00
|
|
|
#%preun lib
|
|
|
|
#if [ "$1" = "0" ]; then
|
|
|
|
# %{__rm} -f %{libdir}/\[commons-collections-tomcat5\].jar \
|
|
|
|
# %{libdir}/\[commons-dbcp-tomcat5\].jar \
|
|
|
|
# %{libdir}/\[commons-pool-tomcat5\].jar \
|
|
|
|
# %{libdir}/\[ecj\].jar >/dev/null 2>&1
|
|
|
|
#fi
|
2008-04-07 22:37:26 +00:00
|
|
|
|
2010-03-26 17:07:32 +00:00
|
|
|
%postun
|
|
|
|
%update_maven_depmap
|
2010-10-14 20:11:37 +00:00
|
|
|
#%{__rm} -rf %{appdir}
|
|
|
|
#%{__rm} -rf %{confdir}
|
|
|
|
#%{__rm} -rf %{libdir}
|
2010-03-26 17:07:32 +00:00
|
|
|
|
2008-04-07 22:37:26 +00:00
|
|
|
%postun jsp-%{jspspec}-api
|
|
|
|
if [ "$1" = "0" ]; then
|
|
|
|
%{_sbindir}/update-alternatives --remove jsp \
|
|
|
|
%{_javadir}/%{name}-jsp-%{jspspec}-api.jar
|
|
|
|
fi
|
|
|
|
|
|
|
|
%postun servlet-%{servletspec}-api
|
|
|
|
if [ "$1" = "0" ]; then
|
|
|
|
%{_sbindir}/update-alternatives --remove servlet \
|
|
|
|
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar
|
2010-11-09 15:37:01 +00:00
|
|
|
%update_maven_depmap
|
2008-04-07 22:37:26 +00:00
|
|
|
fi
|
|
|
|
|
2010-06-29 21:51:36 +00:00
|
|
|
%postun el-%{elspec}-api
|
|
|
|
if [ "$1" = "0" ]; then
|
|
|
|
%{_sbindir}/update-alternatives --remove elspec \
|
|
|
|
%{_javadir}/%{name}-el-%{elspec}-api.jar
|
|
|
|
fi
|
|
|
|
|
2008-04-07 22:37:26 +00:00
|
|
|
%files
|
2010-06-29 21:51:36 +00:00
|
|
|
%defattr(0644,root,tomcat,0775)
|
2008-04-07 22:37:26 +00:00
|
|
|
%doc %{packdname}/{LICENSE,NOTICE,RELEASE*}
|
|
|
|
%attr(0755,root,root) %{_bindir}/%{name}-digest
|
|
|
|
%attr(0755,root,root) %{_bindir}/%{name}-tool-wrapper
|
|
|
|
%attr(0755,root,root) %{_sbindir}/d%{name}
|
|
|
|
%attr(0755,root,root) %{_sbindir}/%{name}
|
|
|
|
%attr(0755,root,root) %{_initrddir}/%{name}
|
|
|
|
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
|
|
|
|
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
|
2010-06-29 21:51:36 +00:00
|
|
|
%attr(0765,root,tomcat) %dir %{basedir}
|
|
|
|
%attr(0765,root,tomcat) %dir %{appdir}
|
|
|
|
%attr(0765,root,tomcat) %dir %{confdir}
|
|
|
|
%attr(0765,root,tomcat) %dir %{confdir}/Catalina
|
|
|
|
#%dir %{confdir}
|
|
|
|
#%dir %{confdir}/Catalina
|
|
|
|
%attr(0765,root,tomcat) %dir %{confdir}/Catalina/localhost
|
2008-04-07 22:37:26 +00:00
|
|
|
%config(noreplace) %{confdir}/%{name}.conf
|
|
|
|
%config(noreplace) %{confdir}/*.policy
|
|
|
|
%config(noreplace) %{confdir}/*.properties
|
|
|
|
%config(noreplace) %{confdir}/context.xml
|
|
|
|
%config(noreplace) %{confdir}/server.xml
|
2010-06-29 21:51:36 +00:00
|
|
|
%attr(0664,root,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml
|
2008-04-07 22:37:26 +00:00
|
|
|
%config(noreplace) %{confdir}/web.xml
|
2010-06-29 21:51:36 +00:00
|
|
|
%attr(0765,tomcat,root) %dir %{cachedir}
|
|
|
|
%attr(0765,tomcat,root) %dir %{tempdir}
|
|
|
|
%attr(0765,tomcat,root) %dir %{workdir}
|
|
|
|
%attr(0765,root,tomcat) %dir %{logdir}
|
|
|
|
%dir %{homedir}
|
|
|
|
#%attr(0765,root,tomcat) %{homedir}/conf
|
|
|
|
%{bindir}/bootstrap-%{version}.jar
|
|
|
|
%{bindir}/bootstrap.jar
|
|
|
|
%{bindir}/catalina-tasks.xml
|
|
|
|
%{bindir}/tomcat-juli-%{version}.jar
|
|
|
|
%{bindir}/tomcat-juli.jar
|
|
|
|
%{homedir}/lib
|
|
|
|
%{homedir}/temp
|
|
|
|
%{homedir}/webapps
|
|
|
|
%{homedir}/work
|
|
|
|
%{homedir}/logs
|
|
|
|
%{homedir}/conf
|
2010-11-09 15:37:01 +00:00
|
|
|
%{_mavendepmapfragdir}/%{name}
|
2010-03-26 17:07:32 +00:00
|
|
|
%{_mavenpomdir}/*.pom
|
|
|
|
# Exclude the POMs that are in sub-packages
|
|
|
|
%exclude %{_mavenpomdir}/*api*
|
2008-04-07 22:37:26 +00:00
|
|
|
|
|
|
|
%files admin-webapps
|
2010-06-29 21:51:36 +00:00
|
|
|
%defattr(0644,root,root,0775)
|
2008-04-07 22:37:26 +00:00
|
|
|
%{appdir}/host-manager
|
|
|
|
%{appdir}/manager
|
|
|
|
|
|
|
|
%files docs-webapp
|
|
|
|
%defattr(0644,root,root,0755)
|
|
|
|
%{appdir}/docs
|
|
|
|
|
|
|
|
%files javadoc
|
|
|
|
%defattr(0644,root,root,0755)
|
|
|
|
%{_javadocdir}/%{name}
|
|
|
|
|
|
|
|
%files jsp-%{jspspec}-api
|
|
|
|
%defattr(0644,root,root,0755)
|
2010-06-29 21:51:36 +00:00
|
|
|
%{_javadir}/%{name}-jsp-%{jspspec}*.jar
|
2010-03-26 17:07:32 +00:00
|
|
|
%{_mavenpomdir}/JPP-%{name}-jsp-api.pom
|
2008-04-07 22:37:26 +00:00
|
|
|
|
2010-06-29 21:51:36 +00:00
|
|
|
%files log4j
|
|
|
|
%defattr(0644,root,tomcat,0775)
|
|
|
|
%config(noreplace) %{confdir}/log4j.properties
|
|
|
|
%{libdir}/log4j.jar
|
|
|
|
%{libdir}/log4j-%{version}.jar
|
|
|
|
|
2008-04-07 22:37:26 +00:00
|
|
|
%files lib
|
|
|
|
%defattr(0644,root,root,0755)
|
|
|
|
%{libdir}
|
|
|
|
|
|
|
|
%files servlet-%{servletspec}-api
|
|
|
|
%defattr(0644,root,root,0755)
|
2010-06-29 21:51:36 +00:00
|
|
|
%{_javadir}/%{name}-servlet-%{servletspec}*.jar
|
2010-11-09 15:37:01 +00:00
|
|
|
%{_mavendepmapfragdir}/%{name}-servlet-api
|
2010-03-26 17:07:32 +00:00
|
|
|
%{_mavenpomdir}/JPP-%{name}-servlet-api.pom
|
2008-04-07 22:37:26 +00:00
|
|
|
|
2010-06-29 21:51:36 +00:00
|
|
|
%files el-%{elspec}-api
|
|
|
|
%defattr(0665,root,root,0755)
|
|
|
|
%{_javadir}/%{name}-el-%{elspec}-api-%{version}.jar
|
|
|
|
%{_javadir}/%{name}-el-%{elspec}-api.jar
|
|
|
|
%{_javadir}/%{name}/%{name}-el-%{elspec}-api-%{version}.jar
|
|
|
|
%{_mavenpomdir}/JPP-%{name}-el-api.pom
|
|
|
|
|
2008-04-07 22:37:26 +00:00
|
|
|
%files webapps
|
2010-06-29 21:51:36 +00:00
|
|
|
%defattr(0644,root,tomcat,0775)
|
2008-04-07 22:37:26 +00:00
|
|
|
%{appdir}/ROOT
|
|
|
|
%{appdir}/examples
|
|
|
|
%{appdir}/sample
|
|
|
|
|
|
|
|
%changelog
|
2010-12-02 14:04:43 +00:00
|
|
|
* Thu Dec 2 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:6.0.26-15
|
|
|
|
- Fix log4j symlink (Resolves rhbz#654660)
|
|
|
|
|
2010-12-01 16:47:50 +00:00
|
|
|
* Mon Nov 29 2010 David Knox <dknox@redhat.com> 0:6.0.26-14
|
|
|
|
- Resolving rhbz 640686: save appdir, confdir, and libdir during
|
|
|
|
- pre and copy them back during posttrans. The directories are
|
|
|
|
- copied to /var/tmp. They are copied back during posttrans and
|
|
|
|
- removed from /var/tmp.
|
|
|
|
|
2010-11-09 15:37:01 +00:00
|
|
|
* Tue Nov 9 2010 Chris Spike <chris.spike@arcor.de> 0:6.0.26-13
|
|
|
|
- Added javax.servlet:servlet-api depmap entry to servlet-2.5-api subpackage
|
|
|
|
|
2010-10-14 20:11:37 +00:00
|
|
|
* Thu Oct 14 2010 David Knox <dknox@redhat.com> 0:6.0.26-12
|
|
|
|
- Resolves rhbz#640686 - Upgrade of tomcat6 wipes out directories
|
|
|
|
- WARNING - Back up all files that need to be preserved before
|
|
|
|
- package update or uninstall - WARNING
|
|
|
|
- Resolves: rhbz#638914 - update versions of commons-collections,
|
|
|
|
- commons-dbcp, and commons-pool
|
|
|
|
|
|
|
|
* Thu Oct 07 2010 David Knox <dknox@redhat.com> 0:6.0.26-11
|
2010-10-07 18:25:50 +00:00
|
|
|
- resolves rhbz#640837 - tomcat user requires login shell
|
|
|
|
|
2010-10-05 15:34:55 +00:00
|
|
|
* Mon Oct 04 2010 David Knox <dknox@redhat.com> 0:6.0.26-10
|
|
|
|
- ant-nodeps is breaking the build. Put ant-nodeps on the
|
|
|
|
- OPT_JAR_LIST
|
|
|
|
|
|
|
|
* Fri Oct 01 2010 David Knox <dknox@rehat.com> 0:6.0.26-9
|
2010-09-29 20:50:41 +00:00
|
|
|
- Resolves rhbz#575341 - Additionally created instances of Tomcat
|
|
|
|
- are broken
|
|
|
|
|
2010-07-01 20:57:57 +00:00
|
|
|
* Fri Jul 02 2010 David Knox <dknox@rehat.com> 0:6.0.26-8
|
|
|
|
- LSB initscript compliance
|
|
|
|
|
2010-07-01 18:04:47 +00:00
|
|
|
* Thu Jul 01 2010 David Knox <dknox@redhat.com> 0:6.0.26-7
|
2010-07-01 20:57:57 +00:00
|
|
|
- Made elspec the standard for elspec %post and %postun.
|
2010-07-01 18:04:47 +00:00
|
|
|
|
2010-06-29 21:51:36 +00:00
|
|
|
* Tue Jun 29 2010 David Knox <dknox@redhat.com> 0:6.0.26-6
|
|
|
|
- Completed package and file sections. Added el-spec. Fixed
|
|
|
|
- directory permission problems.
|
|
|
|
|
|
|
|
* Thu May 6 2010 David Knox <dknox@redhat.com> 0:6.0.26-5
|
|
|
|
- Working on 589145. Tomcat can't find java compiler for java.
|
|
|
|
|
2010-04-08 23:50:29 +00:00
|
|
|
* Tue Apr 08 2010 David Knox <dknox@redhat.com> 0:6.0.26-4
|
|
|
|
- Moved build-jar-repository to later in the install process.
|
|
|
|
|
2010-04-06 19:21:45 +00:00
|
|
|
* Tue Apr 06 2010 David Knox <dknox@redhat.com> 0:6.0.26-3
|
|
|
|
- Incremented the Release tag to 3 to avoid any confusion about which
|
|
|
|
- is the most recent
|
|
|
|
|
2010-04-06 19:02:40 +00:00
|
|
|
* Tue Apr 06 2010 David Knox <dknox@redhat.com> 0:6.0.26-1
|
|
|
|
- Solved packaging problems involving taglibs-standard
|
|
|
|
- Solved packaging problems involving jakarta-commons
|
|
|
|
- Corrected Requires(post) to Requires and checked companion BuildRequires
|
|
|
|
|
2010-04-06 19:21:45 +00:00
|
|
|
* Mon Mar 29 2010 David Knox <dknox@redhat.com> 0:6.0.26-2
|
2010-03-29 17:59:55 +00:00
|
|
|
- Update source to tomcat6.0.26
|
|
|
|
- Bugzilla 572357 - Please retest.
|
|
|
|
- OSGi manifests for servlet-api and jsp-api
|
|
|
|
|
|
|
|
|
2010-03-26 17:07:32 +00:00
|
|
|
* Fri Mar 26 2010 Mary Ellen Foster <mefoster@gmail.com> 0:6.0.24-2
|
|
|
|
- Add maven POMs and metadata
|
2010-03-26 17:12:38 +00:00
|
|
|
- Link tomcat6-juli into /usr/share/java/tomcat6
|
2010-03-26 17:07:32 +00:00
|
|
|
|
2010-03-01 14:44:21 +00:00
|
|
|
* Mon Mar 1 2010 Alexander Kurtakov <akurtako@redhat.com> 0:6.0.24-1
|
|
|
|
- Update to 6.0.24.
|
|
|
|
|
2009-12-22 10:19:57 +00:00
|
|
|
* Tue Dec 22 2009 Alexander Kurtakov <akurtako@redhat.com> 0:6.0.20-2
|
|
|
|
- Drop file requires on /usr/share/java/ecj.jar.
|
|
|
|
|
2009-11-09 20:31:26 +00:00
|
|
|
* Mon Nov 9 2009 Alexander Kurtakov <akurtako@redhat.com> 0:6.0.20-1
|
|
|
|
- Update to 6.0.20. Fixes CVE-2009-0033,CVE-2009-0580.
|
|
|
|
|
2009-07-27 06:05:36 +00:00
|
|
|
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:6.0.18-10.2
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
|
|
|
|
2009-11-09 20:31:26 +00:00
|
|
|
* Wed Apr 1 2009 Alexander Kurtakov <akurtako@redhat.com> 0:6.0.18-9.2
|
2009-04-01 20:29:13 +00:00
|
|
|
- Add OSGi manifest for servlet-api.
|
|
|
|
|
2009-02-25 21:17:27 +00:00
|
|
|
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:6.0.18-9.1
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
|
|
|
|
2008-12-02 16:26:49 +00:00
|
|
|
* Tue Dec 02 2008 David Walluck <dwalluck@redhat.com> 0:6.0.18-8.1
|
|
|
|
- build for Fedora
|
2008-10-13 20:37:31 +00:00
|
|
|
|
2008-12-02 16:26:49 +00:00
|
|
|
* Tue Dec 02 2008 David Walluck <dwalluck@redhat.com> 0:6.0.18-8
|
|
|
|
- fix directory ownership
|
|
|
|
|
|
|
|
* Thu Nov 13 2008 David Walluck <dwalluck@redhat.com> 0:6.0.18-7
|
|
|
|
- add Requires for update-alternatives
|
|
|
|
|
|
|
|
* Tue Oct 07 2008 David Walluck <dwalluck@redhat.com> 0:6.0.18-6
|
2008-10-13 20:15:33 +00:00
|
|
|
- use lsb_release instead of lsb-release to get the distributor
|
|
|
|
|
|
|
|
* Tue Oct 07 2008 David Walluck <dwalluck@redhat.com> 0:6.0.18-5
|
|
|
|
- fix initscript messages on Mandriva Linux
|
|
|
|
- fix help message in initscript
|
|
|
|
|
|
|
|
* Wed Oct 01 2008 David Walluck <dwalluck@redhat.com> 0:6.0.18-4
|
|
|
|
- redefine %%_initrddir for FHS-compliance
|
|
|
|
- make initscript LSB-complaint
|
|
|
|
|
|
|
|
* Fri Sep 26 2008 David Walluck <dwalluck@redhat.com> 0:6.0.18-3
|
|
|
|
- fix status in initscript
|
|
|
|
|
|
|
|
* Thu Sep 25 2008 David Walluck <dwalluck@redhat.com> 0:6.0.18-2
|
|
|
|
- remove initscripts and /sbin/service requirement
|
|
|
|
- call initscript directly without using /sbin/service
|
|
|
|
- require /sbin/chkconfig instead of chkconfig
|
|
|
|
- remove chkconfig requirement from packages that don't require it
|
|
|
|
|
|
|
|
* Tue Aug 26 2008 David Walluck <dwalluck@redhat.com> 0:6.0.18-1
|
2008-09-05 17:14:04 +00:00
|
|
|
- 6.0.18
|
|
|
|
- Resolves: CVE-2008-1232, CVE-2008-1947, CVE-2008-2370, CVE-2008-2938
|
|
|
|
- fix definition of java.security.policy with d%%{name} start-security
|
|
|
|
- don't pass $CATALINA_OPTS with d%%{name} stop
|
|
|
|
- redefine tempdir and workdir for tmpwatch workaround
|
|
|
|
- change eclipse-ecj references to ecj
|
|
|
|
|
2008-07-10 19:42:58 +00:00
|
|
|
* Thu Jul 10 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0:6.0.16-1.8
|
|
|
|
- drop repotag
|
|
|
|
|
2008-04-07 22:37:26 +00:00
|
|
|
* Fri Apr 04 2008 David Walluck <dwalluck@redhat.com> 0:6.0.16-1jpp.7.fc9
|
|
|
|
- version jsp and servlet Provides with their spec versions
|
|
|
|
- remove Obsoletes/Provides for servletapi6 package as it can co-exist
|
|
|
|
- check for java-functions existence in wrapper script
|
|
|
|
- move d%%{name} to %%{name} and create symlink for d%%{name}
|
|
|
|
- improve status function in initscript
|
|
|
|
- change license to ASL 2.0 again as per Fedora guidelines
|
|
|
|
|
|
|
|
* Mon Mar 24 2008 David Walluck <dwalluck@redhat.com> 0:6.0.16-1jpp.6.fc9
|
|
|
|
- remove Requires: tomcat-native
|
|
|
|
- put back original JPackage Group (except javadoc) and License tags
|
|
|
|
- add Provides for jsp and servlet
|
|
|
|
- use ant macro
|
|
|
|
- build and install sample webapp
|
|
|
|
- call /sbin/service to stop service on uninstall
|
|
|
|
- remove references to $RPM_BUILD_DIR
|
|
|
|
- use copy instead of move to fix short-circuit install build
|
|
|
|
- remove prebuilt sample.war
|
|
|
|
- remove Thumbs.db files
|
|
|
|
- add Requires: java >= 0:1.6.0
|
|
|
|
|
|
|
|
* Wed Mar 19 2008 David Walluck <dwalluck@redhat.com> 0:6.0.16-1jpp.5.fc9
|
|
|
|
- explicitly unset CLASSPATH
|
|
|
|
- explicitly set OPT_JAR_LIST to include ant/ant-trax
|
|
|
|
|
|
|
|
* Tue Mar 18 2008 David Walluck <dwalluck@redhat.com> 0:6.0.16-1jpp.4.fc9
|
|
|
|
- remove BuildRequires: sed
|
|
|
|
- remove specific references to icedtea
|
|
|
|
|
|
|
|
* Mon Mar 17 2008 David Walluck <dwalluck@redhat.com> 0:6.0.16-1jpp.3.fc9
|
|
|
|
- add digest and tool-wrapper scripts
|
|
|
|
- Requires: tomcat-native
|
|
|
|
|
|
|
|
* Fri Mar 7 2008 David Walluck <dwalluck@redhat.com> 0:6.0.16-1jpp.2.fc9
|
|
|
|
- use %%{_var} for appdir instead of /srv
|
|
|
|
- use ${JAVACMD} for java executable in wrapper script
|
|
|
|
- use built-in status function in initscript where possible
|
|
|
|
- add missing require on procps for status function
|
|
|
|
- fix java.library.path setting in %%{_sysconfdir}/sysconfig/%%{name}
|
|
|
|
- add patch to document webapps in %%{_sysconfdir}/%%{name}/tomcat-users.xml
|
|
|
|
- remove %%{appdir}/ROOT/admin
|
|
|
|
- move %%{_bindir}/d%%{name} to %%{_sbindir}/d%%{name}
|
|
|
|
|
|
|
|
* Mon Mar 3 2008 David Walluck <dwalluck@redhat.com> 0:6.0.16-1jpp.1.fc9
|
|
|
|
- use %%{_initrddir} macro instead of %%{_sysconfdir}/init.d (rhbz #153187)
|
|
|
|
- fix java.library.path setting in %%{name}.conf (rhbz #253605)
|
|
|
|
- fix incorrect initscript output (rhbz #380921)
|
|
|
|
- update initscript (rhbz #247077)
|
|
|
|
- add logrotate support
|
|
|
|
- fix strange-permission
|
|
|
|
- fix %%prep
|
|
|
|
- replace /var with %%{_var}
|
|
|
|
- replace %%{_localstatedir} with %%{_var}
|
|
|
|
- use %%{logdir} where possible
|
|
|
|
- call build-jar-repository with full path in scriptlets
|
|
|
|
- remove file-based requires
|
|
|
|
- build with icedtea and set as the default JAVA_HOME in %%{name}.conf
|
|
|
|
- fix non-standard-group
|
|
|
|
- change ecj references to eclipse-ecj
|
|
|
|
- change Apache Software License 2.0 to ASL 2.0 for rpmlint
|
|
|
|
|
|
|
|
* Fri Feb 8 2008 Jason Corley <jason.corley@gmail.com> - 0:6.0.16-1jpp
|
|
|
|
- update to 6.0.16
|
|
|
|
|
|
|
|
* Sun Dec 2 2007 Jason Corley <jason.corley@gmail.com> - 0:6.0.14-2jpp
|
|
|
|
- add /etc/tomcat6/Catalina/localhost (Alexander Kurtakov)
|
|
|
|
|
|
|
|
* Tue Aug 14 2007 Jason Corley <jason.corley@gmail.com> 0:6.0.14-1jpp
|
|
|
|
- first JPackage release
|