rpms/tomcat5/devel tomcat5.spec,1.96,1.97
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed May 16 01:09:27 UTC 2007
- Previous message (by thread): rpms/tomcat5/devel tomcat5-5.5.23-http11-build.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 sources, 1.9, 1.10 tomcat5-5.5-jasper.sh.patch, 1.2, 1.3 tomcat5-5.5-jk-build.patch, 1.2, 1.3 tomcat5-5.5.init, 1.4, 1.5 tomcat5-5.5.relink, 1.5, 1.6 tomcat5-5.5-http11-build.patch, 1.2, NONE
- Next message (by thread): rpms/tomcat5/devel tomcat5.spec,1.97,1.98
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: vivekl
Update of /cvs/dist/rpms/tomcat5/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17569
Modified Files:
tomcat5.spec
Log Message:
- Resolve: bug 240208
- Import and merge 0:5.5.23-9jpp from JPP
- Fix formatting of spec
- Use eclipse-ecj in place of ecj
- Apply GCJ specific patches
- Use generic jta for now instead of geronimo-jta-1.0.1B-api
- Add tomcat-juli.jar since gcc bug 29869 is fixed
Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- tomcat5.spec 14 Mar 2007 21:36:42 -0000 1.96
+++ tomcat5.spec 16 May 2007 01:09:25 -0000 1.97
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2007, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -28,6 +28,8 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
%define _with_gcj_support 1
+%define section free
+
%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
# If you want only apis to be built,
@@ -36,8 +38,7 @@
%define without_apisonly %{!?_with_apisonly:1}%{?_with_apisonly:0}
# If you don't want direct ecj support to be built in,
-# while eclipse-ecj isn't available,
-# give rpmbuild option '--without ecj'
+# 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}
@@ -46,7 +47,6 @@
%define majversion 5.5
%define servletspec 2.4
%define jspspec 2.0
-%define section devel
%define tcuid 91
@@ -68,11 +68,13 @@
Name: tomcat5
Epoch: 0
-Version: 5.5.20
-Release: 5jpp.1%{dist}
+Version: 5.5.23
+Release: 9jpp.1%{?dist}
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
@@ -92,7 +94,7 @@
Patch9: %{name}-%{majversion}-jspc.sh.patch
Patch10: %{name}-%{majversion}-setclasspath.sh.patch
Patch12: %{name}-%{majversion}-util-build.patch
-Patch13: %{name}-%{majversion}-http11-build.patch
+Patch13: %{name}-%{version}-http11-build.patch
Patch14: %{name}-%{majversion}-jk-build.patch
Patch16: %{name}-%{majversion}-jspc-classpath.patch
#FIXME Disable JSP pre-compilation on ppc64 and x390x
@@ -124,7 +126,7 @@
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 >= 1.1
+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
@@ -159,9 +161,11 @@
Requires(postun): java-gcj-compat >= 1.0.31
%endif
Requires(post): jpackage-utils >= 0:1.6.0
-Requires(post): /bin/rm,/sbin/chkconfig
+Requires(post): /bin/rm
+Requires(post): /sbin/chkconfig
Requires(post): findutils
-Requires(preun): /bin/rm,/sbin/chkconfig
+Requires(preun): /bin/rm
+Requires(post): /sbin/chkconfig
Requires(preun): findutils
Requires(pre): %{_sbindir}/useradd
Requires(pre): %{_sbindir}/groupadd
@@ -179,9 +183,6 @@
# And it needs its own API subpackages for running
Requires: %{name}-common-lib = %{epoch}:%{version}-%{release}
Requires: %{name}-server-lib = %{epoch}:%{version}-%{release}
-# And it needs its own API subpackages before being installed
-Requires(post): %{name}-common-lib = %{epoch}:%{version}-%{release}
-Requires(post): %{name}-server-lib = %{epoch}:%{version}-%{release}
%description
Tomcat is the servlet container that is used in the official Reference
@@ -209,7 +210,7 @@
%if %{gcj_support}
Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
%endif
%description webapps
@@ -246,8 +247,8 @@
Provides: servlet5
Provides: servlet24
Provides: servletapi5
-Requires(post): chkconfig
-requires(postun): chkconfig
+Requires(post): /sbin/chkconfig
+requires(postun): /sbin/chkconfig
%if %{gcj_support}
# libgcj aot-compiled native libraries
@@ -264,7 +265,8 @@
Summary: Javadoc generated documentation for %{name}-servlet-%{servletspec}-api
Obsoletes: servletapi5-javadoc
Provides: servletapi5-javadoc
-Requires(post): /bin/rm,/bin/ln
+Requires(post): /bin/rm
+Requires(post): /bin/ln
%description servlet-%{servletspec}-api-javadoc
Contains the javadoc generated documentation for the implementation classes
@@ -281,8 +283,8 @@
Requires(postun): %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
Summary: Apache Tomcat Servlet and JSP implementation classes
Provides: jsp
-Requires(post): chkconfig
-Requires(postun): chkconfig
+Requires(post): /sbin/chkconfig
+Requires(postun): /sbin/chkconfig
%if %{gcj_support}
# libgcj aot-compiled native libraries
@@ -297,7 +299,8 @@
%package jsp-%{jspspec}-api-javadoc
Group: Development/Documentation
Summary: Javadoc generated documentation for %{name}-jsp-%{jspspec}-api
-Requires(post): /bin/rm,/bin/ln
+Requires(post): /bin/rm
+Requires(post): /bin/ln
%description jsp-%{jspspec}-api-javadoc
Contains the javadoc generated documentation for the implementation classes
@@ -309,38 +312,15 @@
Summary: Libraries needed to run the Tomcat Web container (part)
Requires: java >= 0:1.4.2
Requires(post): jpackage-utils >= 0:1.6.0
-Requires: ant >= 0:1.6
-Requires(post): ant >= 0:1.6
-Requires: jakarta-commons-collections >= 0:3.1
-Requires(post): jakarta-commons-collections >= 0:3.1
-Requires: jakarta-commons-dbcp >= 0:1.2.1
-Requires(post): jakarta-commons-dbcp >= 0:1.2.1
+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
-Requires: jakarta-commons-logging >= 0:1.0.4
-Requires(post): jakarta-commons-logging >= 0:1.0.4
# FIXME commons-pool is not listed in the Tomcat build.properties.default
-Requires: jakarta-commons-pool >= 0:1.2
-Requires(post): jakarta-commons-pool >= 0:1.2
-# jaf can be provided by classpathx-jaf
-Requires: jaf >= 0:1.0.1
-Requires(post): jaf >= 0:1.0.1
-# javamail can be provided by classpathx-mail
-Requires: javamail >= 0:1.3.1
-Requires(post): javamail >= 0:1.3.1
-Requires: jdbc-stdext
-Requires(post): jdbc-stdext
-Requires: jndi
-Requires(post): jndi
-#FIXME: Replace once maven2 is available
-# replaces non-free jta
-#Requires: geronimo-jta-1.0.1B-api
-Requires: jta >= 0:1.0.1
-#FIXME: Replace once maven2 is available
-#Requires(post): geronimo-jta-1.0.1B-api
-Requires(post): jta >= 0:1.0.1
-Requires: mx4j >= 0:3.0.1
-Requires(post): mx4j >= 0:3.0.1
+Requires: jakarta-commons-pool-tomcat5 >= 0:1.2
+Requires(post): jakarta-commons-pool-tomcat5 >= 0:1.2
%if %{with_ecj}
Requires: eclipse-ecj >= 0:3.1.1
Requires(post): eclipse-ecj >= 0:3.1.1
@@ -370,24 +350,8 @@
Group: Development/Compilers
Summary: Libraries needed to run the Tomcat Web container (part)
Requires(post): jpackage-utils >= 0:1.6.0
-Requires: jakarta-commons-beanutils >= 0:1.7.0
-Requires(post): jakarta-commons-beanutils >= 0:1.7.0
-Requires: jakarta-commons-digester >= 0:1.6
-Requires(post): jakarta-commons-digester >= 0:1.6
-Requires: jakarta-commons-el >= 0:1.0
-Requires(post): jakarta-commons-el >= 0:1.0
-Requires: jakarta-commons-fileupload >= 0:1.0-1jpp
-Requires(post): jakarta-commons-fileupload >= 0:1.0-1jpp
-Requires: jakarta-commons-logging >= 0:1.0.4
-Requires(post): jakarta-commons-logging >= 0:1.0.4
-Requires: jakarta-commons-modeler >= 1.1
-Requires(post): jakarta-commons-modeler >= 1.1
-Requires: jaas
-Requires(post): jaas
-Requires: mx4j >= 0:3.0.1
-Requires(post): mx4j >= 0:3.0.1
-Requires: regexp >= 0:1.3
-Requires(post): regexp >= 0:1.3
+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}
@@ -395,7 +359,6 @@
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
@@ -432,7 +395,7 @@
%endif
%prep
-%{__cat} <<EOT
+%{__cat} << EOT
If you want only apis to be built,
give rpmbuild option '--with apisonly'
@@ -507,7 +470,7 @@
commons-logging.jar=$(build-classpath commons-logging)
commons-daemon.jar=$(build-classpath commons-daemon)
junit.jar=$(build-classpath junit)
-jasper-compiler-jdt.jar=$(build-classpath jdtcore)
+jasper-compiler-jdt.jar=$(build-classpath eclipse-ecj)
EOBP
ant -Djava.home="%{java_home}" -Dbuild.compiler="modern" javadoc
popd
@@ -515,6 +478,7 @@
# build tomcat 5
pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/build
%{__cat} >> build.properties << EOBP
+version=%{version}
ant.jar=%{_javadir}/ant.jar
ant-launcher.jar=%{_javadir}/ant.jar
jtc.home=${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/connectors/
@@ -559,8 +523,7 @@
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
- ant -Djava.home="%{java_home}" build
+ ant -Dbuild.compiler="modern" -Djava.home="%{java_home}" build
popd
# build the connectors
pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/connectors
@@ -599,65 +562,64 @@
%endif
%install
-%{__rm} -rf ${RPM_BUILD_ROOT}
+%{__rm} -rf $RPM_BUILD_ROOT
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_javadir}
%if %{without_apisonly}
export CLASSPATH="%(build-classpath xalan-j2 xml-commons-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}}
-touch ${RPM_BUILD_ROOT}/%{logdir}/catalina.out
+ ${RPM_BUILD_ROOT}{%{confdir},%{logdir},%{homedir},%{bindir}}
+touch ${RPM_BUILD_ROOT}%{logdir}/catalina.out
%{__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}/{rc.d,logrotate.d}
-%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
+%{__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} -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 > tomcat5 << EOT
-# Service-specific configuration file for tomcat5 services
+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/tomcat5/tomcat5.conf, thus allowing values
+# configuration file /etc/%{name}/%{name}.conf, thus allowing values
# to be overridden on a per-service way
#
# NEVER change the init script itself:
# To change values for all services make your changes in
-# /etc/tomcat5/tomcat5.conf
+# /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/tomcat5 (do not copy the init script) and make a copy of the
-# /etc/sysconfig/tomcat5 file to /etc/sysconfig/<you new service> and change
+# /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} >> tomcat5
-install -m 644 tomcat5 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
-%{__rm} tomcat5
+%{__cat} %{SOURCE2} >> %{name}
+%{__install} -m 0644 %{name} ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name}
+%{__rm} %{name}
%{__install} %{SOURCE1} \
- ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/%{name}
+ ${RPM_BUILD_ROOT}%{_sysconfdir}/init.d/%{name}
# Global configuration file
-install -d -m 755 ${RPM_BUILD_ROOT}/%{confdir}
-cat > tomcat5.conf << EOT
-# System-wide configuration file for tomcat5 services
-# This will be sourced by tomcat5 and any secondary service
+%{__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/tomcat5)
+# (see, for instance, /etc/sysconfig/%{name})
#
EOT
-cat %{SOURCE2} >> tomcat5.conf
-install -m 644 tomcat5.conf ${RPM_BUILD_ROOT}/%{confdir}/%{name}.conf
-rm tomcat5.conf
+%{__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 usejikes="false"
export OPT_JAR_LIST="ant/ant-trax xalan-j2-serializer"
- ant -Dbuild.compiler=modern -Djava.home=%{java_home} dist
+ ant -Dbuild.compiler="modern" -Djava.home=%{java_home} dist
pushd dist
%{__mv} bin/* ${RPM_BUILD_ROOT}%{bindir}
%{__mv} common/* ${RPM_BUILD_ROOT}%{commondir}
@@ -671,26 +633,11 @@
workers.properties.minimal ${RPM_BUILD_ROOT}%{confdir}
popd
popd
-# create reloctomcat5 -- commented out for eventual removal -jasonc
-#%{__cat} >> ${RPM_BUILD_ROOT}%{bindir}/reloctomcat5 << EORLTC
-#!/bin/sh
-#
-# backup original config
-#%{__cp} %{confdir}/server.xml %{confdir}/server.xml.bak
-#echo "relocating http & ajp ports to 81xx"
-#%{__sed} -i -e 's|8080|8180|' \
-# -e 's|8081|8181|' \
-# -e 's|8082|8182|' \
-# -e 's|8443|8543|' \
-# -e 's|8009|8109|' \
-# %{confdir}/server.xml
-#
-#EORLTC
# 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.*
+ ${RPM_BUILD_ROOT}%{bindir}/setclasspath.*
# Remove leftover files
%{__rm} -f ${RPM_BUILD_ROOT}%{bindir}/*.orig
# install wrapper as tomcat5
@@ -705,7 +652,7 @@
${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name} \
${RPM_BUILD_ROOT}%{_bindir}/d%{name} \
${RPM_BUILD_ROOT}%{_bindir}/%{name} \
- ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/%{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' \
@@ -718,6 +665,7 @@
-e "s|\@\@\@TCAPP\@\@\@|%{appdir}|g" \
-e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" $i
done
+# Process server/lib
# Remove local JARs (to be replaced with jpp links in post)
pushd ${RPM_BUILD_ROOT}%{serverdir}/lib
find . -name "*.jar" -not -name "catalina*" \
@@ -737,7 +685,6 @@
pushd ${RPM_BUILD_ROOT}%{_javadir}/%{name}
%{__ln_s} -f ${j}-%{version}.jar ${j}.jar
popd
- %{__ln_s} -f %{_javadir}/%{name}/${j}.jar ${j}.jar
done
# servlets* jars will be installed in a public repository
for i in servlets-*.jar; do
@@ -747,7 +694,6 @@
pushd ${RPM_BUILD_ROOT}%{_javadir}/%{name}
%{__ln_s} -f ${j}-%{version}.jar ${j}.jar
popd
- %{__ln_s} -f %{_javadir}/%{name}/${j}.jar ${j}.jar
done
# tomcat* jars will be installed in a public repository
for i in tomcat-*.jar; do
@@ -757,7 +703,6 @@
pushd ${RPM_BUILD_ROOT}%{_javadir}/%{name}
%{__ln_s} -f ${j}-%{version}.jar ${j}.jar
popd
- %{__ln_s} -f %{_javadir}/%{name}/${j}.jar ${j}.jar
done
popd
# Process admin webapp server/webapps/admin
@@ -814,7 +759,6 @@
pushd ${RPM_BUILD_ROOT}%{_javadir}/%{name}
%{__ln_s} -f ${j}-%{version}.jar ${j}.jar
popd
- %{__ln_s} -f %{_javadir}/%{name}/${j}.jar ${j}.jar
done
popd
# Process common/endorsed
@@ -825,7 +769,7 @@
%{__rm} -f ${RPM_BUILD_ROOT}%{commondir}/lib/servlet.jar
# Perform FHS translation
# (final links)
-pushd ${RPM_BUILD_ROOT}/%{homedir}
+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
@@ -836,9 +780,6 @@
[ -d work ] || %{__ln_s} -f %{workdir} work
[ -d temp ] || %{__ln_s} -f %{tempdir} temp
popd
-cd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}
-find ${RPM_BUILD_ROOT}/%{homedir} -maxdepth 1 -type l | \
- %{__sed} -e "s|${RPM_BUILD_ROOT}||g" > homelinks
%endif
# begin servlet api subpackage install
pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi
@@ -854,16 +795,16 @@
# 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}
+ ${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
+ ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-servlet-%{servletspec}-api
popd
# 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}
+ ${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
@@ -871,48 +812,49 @@
jspapi.jar
popd
# javadoc jsp
- %{__install} -d -m 755 ${RPM_BUILD_ROOT}/%{_javadocdir}/%{name}-jsp-%{jspspec}-api-%{version}
+ %{__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}
+ ${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
+ ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-jsp-%{jspspec}-api
popd
%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
+ ${RPM_BUILD_ROOT}%{_bindir}/jspc5.sh
%{__install} -m 755 src/bin/%{jname}.sh \
- ${RPM_BUILD_ROOT}/%{_bindir}/%{full_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
+ ${RPM_BUILD_ROOT}%{_bindir}/%{full_jname}-setclasspath.sh
popd
# javadoc
-%{__install} -d -m 755 ${RPM_BUILD_ROOT}/%{_javadocdir}/%{jname}-%{version}
+%{__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}
+ ${RPM_BUILD_ROOT}%{_javadocdir}/%{jname}-%{version}
# ghost symlink
- %{__ln_s} %{jname}-%{version} ${RPM_BUILD_ROOT}/%{_javadocdir}/%{jname}
+ %{__ln_s} %{jname}-%{version} ${RPM_BUILD_ROOT}%{_javadocdir}/%{jname}
popd
# disable the juli log manager until the classpath
# java.util.logging.LogManager is fixed
# XXX: Still not fixed - http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29869
-rm -f $RPM_BUILD_ROOT%{bindir}/tomcat-juli.jar
+# rm -f $RPM_BUILD_ROOT%{bindir}/tomcat-juli.jar
%endif
%if %{gcj_support}
# Remove non-standard jars from the list for aot compilation
-aot-compile-rpm --exclude var/lib/tomcat5/webapps/tomcat-docs/appdev/sample/sample.war \
- --exclude var/lib/tomcat5/webapps/servlets-examples/WEB-INF/classes \
- --exclude var/lib/tomcat5/webapps/jsp-examples/WEB-INF/classes \
- --exclude var/lib/tomcat5/webapps/jsp-examples/plugin/applet \
- --exclude var/lib/tomcat5/server/lib/servlets-cgi.renametojar \
- --exclude var/lib/tomcat5/server/lib/servlets-ssi.renametojar
+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
@@ -922,22 +864,35 @@
%post
# 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
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
build-jar-repository %{commondir}/endorsed jaxp_parser_impl \
xml-commons-apis 2>&1
+build-jar-repository %{commondir}/lib commons-collections-tomcat5 \
+ commons-dbcp-tomcat5 commons-el commons-pool-tomcat5 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
+ %{_bindir}/rebuild-gcj-db
%endif
%if %{gcj_support}
@@ -945,31 +900,8 @@
%{_bindir}/rebuild-gcj-db
%endif
-%post common-lib
-# 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
-for repository in %{commondir}/lib ; do
- find $repository -name '\[*\]*.jar' -not -type d | xargs %{__rm} -f
-done
-#FIXME: Replace jta with geronimo-jta-1.0.1B-api when maven2 is imported
-build-jar-repository %{commondir}/lib ant commons-collections commons-dbcp \
- commons-el commons-logging-api commons-pool jaf javamail jdbc-stdext \
- jndi jsp jta mx4j/mx4j servlet %{jname}5-compiler \
- %{jname}5-runtime 2>&1
-%if %{with_ecj}
-pushd %{commondir}/lib >/dev/null
- build-jar-repository . jdtcore
-popd >/dev/null
-%endif
-
%if %{gcj_support}
+%post common-lib
%{_bindir}/rebuild-gcj-db
%endif
@@ -978,29 +910,8 @@
%{_bindir}/rebuild-gcj-db
%endif
-%post server-lib
-# 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
-for repository in %{serverdir}/lib ; do
- find $repository -name '\[*\]*.jar' -not -type d | xargs %{__rm} -f
-done
-build-jar-repository %{serverdir}/lib catalina-ant5 commons-beanutils \
- commons-digester commons-el commons-fileupload commons-logging \
- commons-modeler jaas mx4j/mx4j regexp 2>&1
-%if %{with_ecj}
-pushd %{serverdir}/lib >/dev/null
- build-jar-repository . jdtcore
-popd >/dev/null
-%endif
-
%if %{gcj_support}
+%post server-lib
%{_bindir}/rebuild-gcj-db
%endif
@@ -1012,49 +923,36 @@
%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"
build-jar-repository %{appdir}/jsp-examples/WEB-INF/lib \
jakarta-taglibs-core jakarta-taglibs-standard 2>&1
-
%if %{gcj_support}
-%{_bindir}/rebuild-gcj-db
+ %{_bindir}/rebuild-gcj-db
%endif
%if %{gcj_support}
%postun webapps
-%{_bindir}/rebuild-gcj-db
+ %{_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
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 \
- struts tomcat5/catalina-admin 2>&1
+ struts %{name}/catalina-admin 2>&1
build-jar-repository %{serverdir}/webapps/host-manager/WEB-INF/lib \
- tomcat5/catalina-host-manager 2>&1
+ %{name}/catalina-host-manager 2>&1
build-jar-repository %{serverdir}/webapps/manager/WEB-INF/lib \
- commons-fileupload tomcat5/catalina-manager 2>&1
+ commons-fileupload %{name}/catalina-manager 2>&1
%if %{gcj_support}
-%{_bindir}/rebuild-gcj-db
+ %{_bindir}/rebuild-gcj-db
%endif
%if %{gcj_support}
%postun admin-webapps
-%{_bindir}/rebuild-gcj-db
+ %{_bindir}/rebuild-gcj-db
%endif
%endif
@@ -1062,7 +960,7 @@
update-alternatives --install %{_javadir}/servlet.jar servlet \
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar 20400
%if %{gcj_support}
-%{_bindir}/rebuild-gcj-db
+ %{_bindir}/rebuild-gcj-db
%endif
%post servlet-%{servletspec}-api-javadoc
@@ -1077,7 +975,7 @@
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar
fi
%if %{gcj_support}
-%{_bindir}/rebuild-gcj-db
+ %{_bindir}/rebuild-gcj-db
%endif
%post jsp-%{jspspec}-api
@@ -1085,7 +983,7 @@
%{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20000
%if %{gcj_support}
-%{_bindir}/rebuild-gcj-db
+ %{_bindir}/rebuild-gcj-db
%endif
@@ -1101,7 +999,7 @@
%{_javadir}/%{name}-jsp-%{jspspec}-api.jar
fi
%if %{gcj_support}
-%{_bindir}/rebuild-gcj-db
+ %{_bindir}/rebuild-gcj-db
%endif
%if %{without_apisonly}
@@ -1109,26 +1007,16 @@
# 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}
+ [ -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 %{commondir}/endorsed; do
find $repository -name '\[*\]*.jar' -not -type d | xargs %{__rm} -f
done
-fi
-
-%preun server-lib
-if [ $1 = 0 ]; then
- # Remove automated symlinks
- for repository in %{serverdir}/lib ; do
+ for repository in %{commondir}/lib ; do
find $repository -name '\[*\]*.jar' -not -type d | xargs %{__rm} -f
done
-fi
-
-%preun common-lib
-if [ $1 = 0 ]; then
- # Remove automated symlinks
- for repository in %{commondir}/lib ; do
+ for repository in %{serverdir}/lib ; do
find $repository -name '\[*\]*.jar' -not -type d | xargs %{__rm} -f
done
fi
@@ -1155,9 +1043,18 @@
%endif
%if %{without_apisonly}
-%files -f %{packdname}/homelinks
+%files
%defattr(644,root,root,755)
%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}
@@ -1168,9 +1065,10 @@
%dir %{commondir}/lib
%dir %{commondir}/endorsed
%dir %{commondir}/i18n
-%dir %{serverdir}/
+%dir %{serverdir}
%dir %{serverdir}/classes
%dir %{serverdir}/lib
+%{serverdir}/lib/*.renametojar
%dir %{shareddir}
%dir %{shareddir}/classes
%dir %{shareddir}/lib
@@ -1184,13 +1082,15 @@
%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}/*
-%attr(755,root,root) %{_sysconfdir}/rc.d/init.d/%{name}
+%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}/tomcat5.conf
+%config(noreplace) %{confdir}/%{name}.conf
%config(noreplace) %{confdir}/server-minimal.xml
%config(noreplace) %{confdir}/server.xml
%config(noreplace) %{confdir}/web.xml
@@ -1213,7 +1113,6 @@
%defattr(644,root,root,755)
%dir %{_javadir}/%{name}
%{_javadir}/%{name}/naming*.jar
-%{commondir}/lib/*
%if %{gcj_support}
%attr(-,root,root) %{_libdir}/gcj/%{name}/naming-*
%endif
@@ -1230,7 +1129,6 @@
%{_javadir}/%{name}/catalina-storeconfig*.jar
%{_javadir}/%{name}/servlets*.jar
%{_javadir}/%{name}/tomcat*.jar
-%{serverdir}/lib/*
%if %{gcj_support}
%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-ant*
%attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-cluster*
@@ -1329,13 +1227,82 @@
%ghost %doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api
%changelog
-* Mon Jan 29 2007 Vivek Lakshmanan <vivekl at redhat.com> 0:5.5.20-5jpp.1.fc7
-- Merge with latest from JPP
-- Replace references to geronimo JTA with a generic one available in Fedora
-- Use Fedora compliant build root specification
-- Enabling juli still kills tomcat5 on startup, disabled
-- Add patch to force -source to 5.0 when 1.5 support enabled since
- ecj seems to use 1.4 as default still
+* Tue May 15 2007 Vivek Lakshmanan <vivekl at redhat.com> 0:5.5.23-9jpp.1
+- Resolve: bug 240208
+- Import and merge 0:5.5.23-9jpp from JPP
+- Fix formatting of spec
+- Use eclipse-ecj in place of ecj
+- Apply GCJ specific patches
+- Use generic jta for now instead of geronimo-jta-1.0.1B-api
+- Add tomcat-juli.jar since gcc bug 29869 is fixed
+
+* Fri May 11 2007 Jason Corley <jason.corley at 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 at 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 at 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 at gmail.com> 0:5.5.23-5jpp
+- replace references to jdtcore with ecj
+
+* Fri Mar 16 2007 Jason Corley <jason.corley at 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 at 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 at 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 at gmail.com> 0:5.5.23-1jpp
+- update to 5.5.23
+
+* Mon Feb 26 2007 Jason Corley <jason.corley at 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 at 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 at gmail.com> 0:5.5.20-4jpp
- remove jk2 configs as mod_jk2 has been deprecated upstream
@@ -1367,9 +1334,6 @@
- remove Vendor and Distribution (should be defined in ~/.rpmmacros)
- replace perl -pi -e with sed -i -e
-* Wed Oct 4 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-8jpp.1
-- Merge with upstream
-
* Wed Oct 4 2006 Permaine Cheung <pcheung at redhat.com> 0:5.5.17-8jpp
- Fix condrestart in init script and location of init script in the spec file.
@@ -1379,50 +1343,12 @@
* Mon Oct 2 2006 Permaine Cheung <pcheung at redhat.com> 0:5.5.17-6jpp
- Add the ability to start multiple instances of tomcat on the same machine.
-* Wed Aug 30 2006 Deepak Bhole <dbhole at redhat.com> 5.5.17-6jpp.2
-- Rebuilding.
-
-* Mon Aug 21 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-6jpp.1
-- Merge with upstream
-
-* Mon Aug 21 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-6jpp
-- Rebuild
-
* Mon Aug 21 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-5jpp
From Andrew Overholt <overholt at redhat.com>:
- Silence post common-lib and server-lib.
-* Thu Jul 27 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_5fc
-- Fix regression in relink with patch from Matt Wringe
-
-* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:5.5.17-3jpp_4fc
-- Rebuilt
-
-* Thu Jul 13 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_3fc
-- Rebuild in full
-
-* Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_2fc
-- Re-enable ppc64 and s390x
-- Disable JSP pre-compilation on ppc64 and x390x (FIXME)
-- Bootstrap mode (with apisonly) build
-
-* Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_1fc
-- Full build
-- Do not build on ppc64 and s390x
-- Fix servlet-api.jar path
-- Add version to catalina .so
-From Ralph Apel <rapel at redhat.com>:
-- Re-add patch to add rt.jar
-- Add mx4j JMX API and struts to classpath
-
-* Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_0fc
-- Upgrade
-- Use any JTA for now
-- Try and remove exclude for sample.war
-- Bootstrap build with apisonly
-
-* Wed Jul 05 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-3jpp_1rh
-- Merge with upstream
+* Thu Jul 27 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-4jpp
+- Fix regression in relink with changes from Matt Wringe
* Fri Jun 30 2006 Ralph Apel <r.apel at r-apel.de> 0:5.5.17-3jpp
- Create option --with apisonly to build just tomcat5-servlet-2.4-api,
@@ -1430,12 +1356,6 @@
- Create option --without ecj to build even when eclipse-ecj not available
- Drop several unnecessary export CLASSPATH=
-* Sat Jun 17 2006 Deepak Bhole <dbhole at redhat.com> - 0:5.5.15-1jpp_7fc
-- Re-enable ppc64, s390 and s390x architectures now that eclipse is built there
-
-* Mon May 15 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-2jpp_1rh
-- Merge with upstream for upgrade to 5.5.17
-
* Mon May 15 2006 Fernando Nasser <fnasser at redhat.com> 0:5.5.17-2jpp
- Requires on post things that are linked to at post
Merge changes from downstream:
@@ -1464,28 +1384,6 @@
* Fri Mar 24 2006 Ralph Apel <r.apel at r-apel.de> 0:5.5.16-1jpp
- Upgrade to 5.5.16
-* Mon Mar 6 2006 Jeremy Katz <katzj at redhat.com> - 0:5.5.15-1jpp_6fc
-- stop scriptlet spew
-
-* Fri Mar 3 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:5.5.15-1jpp_5fc
-- Require java-gcj-compat for post and postun sections of
- servlet-%{servletspec}-api, jsp-%{jspspec}-api-javadoc and
- server-lib sub-packages, since these three packages call
- %{_bindir}/rebuild-gcj-db in their post and/or postun sections.
-
-* Wed Mar 1 2006 Rafael Schloming <rafaels at redhat.com> - 0:5.5.15-1jpp_4fc
-- Disabled juli logging as a workaround for a number of classpath bugs
-- in java.util.logging.*
-
-* Thu Feb 23 2006 Rafael Schloming <rafaels at redhat.com> - 0:5.5.15-1jpp_3fc
-- Added jasper-foo symlinks for jars.
-
-* Wed Feb 22 2006 Rafael Schloming <rafaels at redhat.com> - 0:5.5.15-1jpp_2fc
-- Exclude ppc64 s390 s390x
-
-* Wed Feb 22 2006 Rafael Schloming <rafaels at redhat.com> - 0:5.5.15-1jpp_1fc
-- Updated to 5.5.15
-
* Tue Feb 14 2006 Ralph Apel <r.apel at r-apel.de> 0:5.5.12-2jpp
- Fix jta.jar location
- Previous message (by thread): rpms/tomcat5/devel tomcat5-5.5.23-http11-build.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 sources, 1.9, 1.10 tomcat5-5.5-jasper.sh.patch, 1.2, 1.3 tomcat5-5.5-jk-build.patch, 1.2, 1.3 tomcat5-5.5.init, 1.4, 1.5 tomcat5-5.5.relink, 1.5, 1.6 tomcat5-5.5-http11-build.patch, 1.2, NONE
- Next message (by thread): rpms/tomcat5/devel tomcat5.spec,1.97,1.98
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list