[tomcat: 25/66] corrections for LSB compliance. Increment tag.
by Ivan Afonichev
commit 5a3944a0f0bfcf6a8928b03095da8d13d50a6dba
Author: Dave Knox <dknox(a)fedoraproject.org>
Date: Thu Jul 1 20:57:57 2010 +0000
corrections for LSB compliance. Increment tag.
tomcat6.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/tomcat6.spec b/tomcat6.spec
index a36b2c4..6b7559a 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -55,7 +55,7 @@
Name: tomcat6
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: Networking/Daemons
@@ -597,8 +597,11 @@ fi
%{appdir}/sample
%changelog
+* Fri Jul 02 2010 David Knox <dknox(a)rehat.com> 0:6.0.26-8
+- LSB initscript compliance
+
* Thu Jul 01 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-7
-- Made elspec the standard for elspec %post and %postun
+- Made elspec the standard for elspec %post and %postun.
* Tue Jun 29 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-6
- Completed package and file sections. Added el-spec. Fixed
13 years
[tomcat: 24/66] corrections for LSB compliance
by Ivan Afonichev
commit 186acca061cd9d6c390704cc7b26a6a75eed9e90
Author: Dave Knox <dknox(a)fedoraproject.org>
Date: Thu Jul 1 20:55:12 2010 +0000
corrections for LSB compliance
tomcat6-6.0.init | 91 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 59 insertions(+), 32 deletions(-)
---
diff --git a/tomcat6-6.0.init b/tomcat6-6.0.init
index 930c0fc..e4e9517 100644
--- a/tomcat6-6.0.init
+++ b/tomcat6-6.0.init
@@ -141,8 +141,13 @@ function parseOptions() {
# See how we were called.
function start() {
- echo -n "Starting ${TOMCAT_PROG}: "
- if [ -f "/var/lock/subsys/${NAME}" ] ; then
+
+ echo -n "Starting ${TOMCAT_PROG}: "
+ if [ "$RETVAL" != "0" ]; then
+ log_failure_msg
+ return
+ fi
+ if [ -f "/var/lock/subsys/${NAME}" ]; then
if [ -f "/var/run/${NAME}.pid" ]; then
read kpid < /var/run/${NAME}.pid
# if checkpid $kpid 2>&1; then
@@ -157,11 +162,15 @@ function start() {
fi
# fix permissions on the log and pid files
export CATALINA_PID="/var/run/${NAME}.pid"
- touch $CATALINA_PID
- chown ${TOMCAT_USER}:${TOMCAT_USER} $CATALINA_PID
- touch $TOMCAT_LOG
- chown ${TOMCAT_USER}:${TOMCAT_USER} $TOMCAT_LOG
- if [ "$CATALINA_HOME" != "/usr/share/tomcat6" ]; then
+ touch $CATALINA_PID 2>&1 || RETVAL="4"
+ if [ "$RETVAL" -eq "0" -a "$?" -eq "0" ]; then
+ chown ${TOMCAT_USER}:${TOMCAT_USER} $CATALINA_PID
+ fi
+ [ "$RETVAL" -eq "0" ] && touch $TOMCAT_LOG 2>&1 || RETVAL="4"
+ if [ "$RETVAL" -eq "0" -a "$?" -eq "0" ]; then
+ chown ${TOMCAT_USER}:${TOMCAT_USER} $TOMCAT_LOG
+ fi
+ if [ "$CATALINA_HOME" != "/usr/share/tomcat6" -a "$RETVAL" -eq "0" ]; then
# Create a tomcat directory if it doesn't exist
makeHomeDir
# If CATALINA_HOME doesn't exist modify port number so that
@@ -172,37 +181,37 @@ function start() {
${CATALINA_HOME}/conf/server.xml
fi
parseOptions
- if [ "$SECURITY_MANAGER" = "true" ]; then
+ if [ "$RETVAL" -eq "0" -a "$SECURITY_MANAGER" = "true" ]; then
$SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start-security" \
- >> $TOMCAT_LOG 2>&1
+ >> $TOMCAT_LOG 2>&1 || RETVAL="4"
else
- $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start" >> $TOMCAT_LOG 2>&1
+
+ [ "$RETVAL" -eq "0" ] && $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start" >> $TOMCAT_LOG 2>&1 || RETVAL="4"
fi
- RETVAL="$?"
- if [ "$RETVAL" -eq 0 ]; then
+ if [ "$RETVAL" -eq "0" ]; then
log_success_msg
touch /var/lock/subsys/${NAME}
else
- log_failure_msg
+ log_failure_msg "Error code ${RETVAL}"
fi
if [ "$DISTRIB_ID" = "MandrivaLinux" ]; then
echo
fi
- return $RETVAL
}
function stop() {
- RETVAL="0"
echo -n "Stopping ${TOMCAT_PROG}: "
if [ -f "/var/lock/subsys/${NAME}" ]; then
- parseOptions
- $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} stop" >> $TOMCAT_LOG 2>&1
- RETVAL="$?"
- if [ "$RETVAL" -eq "0" ]; then
- count="0"
- if [ -f "/var/run/${NAME}.pid" ]; then
- read kpid < /var/run/${NAME}.pid
- until [ "$(ps --pid $kpid | grep -c $kpid)" -eq "0" ] || \
+ parseOptions
+ if [ "$RETVAL" -eq "0" ]; then
+ touch /var/lock/subsys/${NAME} 2>&1 || RETVAL="4"
+ [ "$RETVAL" -eq "0" ] && $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} stop" >> $TOMCAT_LOG 2>&1 || RETVAL="4"
+ fi
+ if [ "$RETVAL" -eq "0" ]; then
+ count="0"
+ if [ -f "/var/run/${NAME}.pid" ]; then
+ read kpid < /var/run/${NAME}.pid
+ until [ "$(ps --pid $kpid | grep -c $kpid)" -eq "0" ] || \
[ "$count" -gt "$SHUTDOWN_WAIT" ]; do
if [ "$SHUTDOWN_VERBOSE" = "true" ]; then
echo "waiting for processes $kpid to exit"
@@ -212,7 +221,7 @@ function stop() {
done
if [ "$count" -gt "$SHUTDOWN_WAIT" ]; then
if [ "$SHUTDOWN_VERBOSE" = "true" ]; then
- echo "killing processes which didn't stop after $SHUTDOWN_WAIT seconds"
+ log_warning_msg "killing processes which did not stop after ${SHUTDOWN_WAIT} seconds"
fi
kill -9 $kpid
fi
@@ -221,17 +230,25 @@ function stop() {
rm -f /var/lock/subsys/${NAME} /var/run/${NAME}.pid
else
log_failure_msg
+ RETVAL="4"
fi
else
log_success_msg
+ RETVAL="0"
fi
if [ "$DISTRIB_ID" = "MandrivaLinux" ]; then
echo
fi
- return $RETVAL
+}
+
+function usage()
+{
+ echo "Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|status|version}"
+ RETVAL="2"
}
# See how we were called.
+RETVAL="0"
case "$1" in
start)
start
@@ -260,32 +277,42 @@ case "$1" in
;;
status)
if [ -f "/var/run/${NAME}.pid" ]; then
-# status ${NAME}
-# RETVAL="$?"
read kpid < /var/run/${NAME}.pid
if [ -d "/proc/${kpid}" ]; then
- echo "${NAME} (pid ${kpid}) is running..."
+ log_success_msg "${NAME} (pid ${kpid}) is running..."
RETVAL="0"
+ else
+# The pid file exists but the process is not running
+ log_warning_msg "PID file exists, but process is not running"
+ RETVAL="1"
fi
else
pid="$(/usr/bin/pgrep -d , -u ${TOMCAT_USER} -G ${TOMCAT_USER} java)"
if [ -z "$pid" ]; then
# status ${NAME}
# RETVAL="$?"
- echo "${NAME} is stopped"
+ log_success_msg "${NAME} is stopped"
RETVAL="3"
else
- echo "${NAME} (pid $pid) is running..."
+ log_success_msg "${NAME} (pid $pid) is running..."
RETVAL="0"
fi
fi
+ if [ -f /var/lock/subsys/${NAME} ]; then
+ pid="$(/usr/bin/pgrep -d , -u ${TOMCAT_USER} -G ${TOMCAT_USER} java)"
+# The lockfile exists but the process is not running
+ if [ -z "$pid" ]; then
+ log_failure_msg "${NAME} lockfile exists but process is not running"
+ RETVAL="2"
+ fi
+ fi
;;
version)
${TOMCAT_SCRIPT} version
;;
*)
- echo "Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|status|version}"
- RETVAL="2"
+ usage
+ ;;
esac
exit $RETVAL
13 years
[tomcat: 23/66] Made elspec the standard for elspec %post and %postun
by Ivan Afonichev
commit 431c79f46fd315b3399bc659b12a91939a8aa18b
Author: Dave Knox <dknox(a)fedoraproject.org>
Date: Thu Jul 1 18:04:47 2010 +0000
Made elspec the standard for elspec %post and %postun
tomcat6.spec | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/tomcat6.spec b/tomcat6.spec
index 1697745..a36b2c4 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -55,7 +55,7 @@
Name: tomcat6
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: Networking/Daemons
@@ -455,7 +455,7 @@ done
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar 20500
%post el-%{elspec}-api
-%{_sbindir}/update-alternatives --install %{_javadir}/el.jar elspec \
+%{_sbindir}/update-alternatives --install %{_javadir}/elspec.jar elspec \
%{_javadir}/%{name}-el-%{elspec}-api.jar 20250
#%post webapps
@@ -502,7 +502,6 @@ fi
if [ "$1" = "0" ]; then
%{_sbindir}/update-alternatives --remove elspec \
%{_javadir}/%{name}-el-%{elspec}-api.jar
-el-%{elspec}-api.jar
fi
%files
@@ -598,6 +597,9 @@ fi
%{appdir}/sample
%changelog
+* Thu Jul 01 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-7
+- Made elspec the standard for elspec %post and %postun
+
* Tue Jun 29 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-6
- Completed package and file sections. Added el-spec. Fixed
- directory permission problems.
13 years
[tomcat: 22/66] Added missing packages. Filled out %%files sections. Fixed directory permissions.
by Ivan Afonichev
commit d2e4841496d051ae61740cfe562800c8a69ff4e8
Author: Dave Knox <dknox(a)fedoraproject.org>
Date: Tue Jun 29 21:51:36 2010 +0000
Added missing packages. Filled out %%files sections. Fixed directory
permissions.
tomcat6-6.0-log4j.properties | 11 ++
tomcat6.spec | 297 +++++++++++++++++++++++++++---------------
2 files changed, 201 insertions(+), 107 deletions(-)
---
diff --git a/tomcat6-6.0-log4j.properties b/tomcat6-6.0-log4j.properties
new file mode 100644
index 0000000..1252a64
--- /dev/null
+++ b/tomcat6-6.0-log4j.properties
@@ -0,0 +1,11 @@
+log4j.rootLogger=debug, R
+log4j.appender.R=org.apache.log4j.RollingFileAppender
+log4j.appender.R.File=${catalina.home}/logs/tomcat.log
+log4j.appender.R.MaxFileSize=10MB
+log4j.appender.R.MaxBackupIndex=10
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n
+log4j.logger.org.apache.catalina=DEBUG, R
+log4j.logger.org.apache.catalina.core.ContainerBase.[Catalina].[localhost]=DEBUG, R
+log4j.logger.org.apache.catalina.core=DEBUG, R
+log4j.logger.org.apache.catalina.session=DEBUG, R
diff --git a/tomcat6.spec b/tomcat6.spec
index 12aac3e..1697745 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -36,6 +36,7 @@
%global micro_version 26
%global packdname apache-tomcat-%{version}-src
%global servletspec 2.5
+%global elspec 2.1
%global tcuid 91
# FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/
@@ -54,7 +55,7 @@
Name: tomcat6
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 4%{?dist}
+Release: 6%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: Networking/Daemons
@@ -70,11 +71,11 @@ Source6: %{name}-%{major_version}.%{minor_version}-digest.script
Source7: %{name}-%{major_version}.%{minor_version}-tool-wrapper.script
Source8: servlet-api-OSGi-MANIFEST.MF
Source9: jsp-api-OSGi-MANIFEST.MF
+Source10: %{name}-%{major_version}.%{minor_version}-log4j.properties
Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch
-
BuildRequires: ant
BuildRequires: ant-trax
BuildRequires: ecj
@@ -88,10 +89,12 @@ BuildRequires: jakarta-taglibs-standard
BuildRequires: java-1.6.0-devel
BuildRequires: jpackage-utils >= 0:1.7.0
BuildRequires: junit
+BuildRequires: log4j
Requires(pre): shadow-utils
Requires(pre): shadow-utils
Requires: jakarta-commons-daemon
Requires: jakarta-commons-logging
+Requires: jakarta-commons-collections
Requires: java-1.6.0
Requires: procps
Requires: %{name}-lib = %{epoch}:%{version}-%{release}
@@ -147,11 +150,21 @@ Requires(postun): %{_sbindir}/update-alternatives
%description jsp-%{jspspec}-api
Apache Tomcat JSP API implementation classes.
+
+%package log4j
+Group: Internet/WWW/Dynamic Content
+Summary: Log4j support for Apache Tomcat
+Requires: jakarta-commons-logging
+
+%description log4j
+Log4j support for Apache Tomcat
+
%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}
+Requires: %{name}-el-%{elspec}-api = %{epoch}:%{version}-%{release}
Requires: ecj
Requires: jakarta-commons-collections-tomcat5
Requires: jakarta-commons-dbcp-tomcat5
@@ -173,6 +186,17 @@ Requires(postun): %{_sbindir}/update-alternatives
%description servlet-%{servletspec}-api
Apache Tomcat Servlet API implementation classes.
+%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.
+
%package webapps
Group: System Environment/Applications
Summary: The ROOT and examples web applications for Apache Tomcat
@@ -186,43 +210,45 @@ The ROOT and examples web applications for Apache Tomcat.
%setup -q -c -T -a 0
# remove pre-built binaries and windows files
find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \
- -name "*.jar" -o -name "*.war" -o -name "*.zip" \) | xargs -t %{__rm}
+ -name "*.jar" -o -name "*.war" -o -name "*.zip" \) | xargs -t %{__rm}
pushd %{packdname}
%patch0 -p0
%patch1 -p0
+%{__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
popd
%build
export CLASSPATH=
export OPT_JAR_LIST="ant/ant-trax"
pushd %{packdname}
- # 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" \
- -Dcommons-collections.jar="$(build-classpath commons-collections)" \
- -Dcommons-daemon.jar="$(build-classpath commons-daemon)" \
- -Dcommons-daemon.jsvc.tar.gz="HACK" \
- -Djasper-jdt.jar="$(build-classpath ecj)" \
- -Djdt.jar="$(build-classpath ecj)" \
- -Dtomcat-dbcp.jar="HACK" \
- -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
+ # 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" \
+ -Dcommons-collections.jar="$(build-classpath commons-collections)" \
+ -Dcommons-daemon.jar="$(build-classpath commons-daemon)" \
+ -Dcommons-daemon.jsvc.tar.gz="HACK" \
+ -Djasper-jdt.jar="$(build-classpath ecj)" \
+ -Djdt.jar="$(build-classpath ecj)" \
+ -Dtomcat-dbcp.jar="HACK" \
+ -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
# remove some jars that we'll replace with symlinks later
- %{__rm} output/build/bin/commons-daemon.jar \
- output/build/lib/ecj.jar
+ %{__rm} output/build/bin/commons-daemon.jar \
+ output/build/lib/ecj.jar
# remove the cruft we created
- %{__rm} output/build/bin/HACK \
- output/build/bin/tomcat-native.tar.gz \
- output/build/lib/HACK
+ %{__rm} output/build/bin/HACK \
+ output/build/bin/tomcat-native.tar.gz \
+ output/build/lib/HACK
popd
pushd %{packdname}/output/dist/src/webapps/docs/appdev/sample/src
%{__mkdir_p} ../web/WEB-INF/classes
@@ -252,18 +278,19 @@ zip -u %{packdname}/output/build/lib/jsp-api.jar META-INF/MANIFEST.MF
%{__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}
-%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{confdir}
-%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{confdir}/Catalina/localhost
+%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{confdir}
+%{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{confdir}/Catalina/localhost
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{libdir}
-%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{logdir}
-%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{homedir}
-%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{tempdir}
-%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{workdir}
+%{__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}
# move things into place
# First copy supporting libs to tomcat lib
pushd %{packdname}/output/build
%{__cp} -a bin/*.{jar,xml} ${RPM_BUILD_ROOT}%{bindir}
+ %{__cp} %{SOURCE10} conf/log4j.properties
%{__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}
@@ -273,12 +300,12 @@ pushd %{packdname}/output/dist/webapps
%{__cp} -a docs/api/* ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}
popd
%{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
- -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
- -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE1} \
+ -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
+ -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE1} \
> ${RPM_BUILD_ROOT}%{confdir}/%{name}.conf
%{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
- -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
- -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE3} \
+ -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
+ -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE3} \
> ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name}
%{__install} -m 0644 %{SOURCE2} \
${RPM_BUILD_ROOT}%{_initrddir}/%{name}
@@ -288,22 +315,24 @@ popd
%{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE5} \
> ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}
%{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
- -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
- -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE6} \
+ -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
+ -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE6} \
> ${RPM_BUILD_ROOT}%{_bindir}/%{name}-digest
%{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
- -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
- -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE7} \
+ -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
+ -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE7} \
> ${RPM_BUILD_ROOT}%{_bindir}/%{name}-tool-wrapper
# create jsp and servlet API symlinks
pushd ${RPM_BUILD_ROOT}%{_javadir}
- %{__mv} %{name}/jsp-api.jar %{name}-jsp-%{jspspec}-api-%{version}.jar
- %{__mv} %{name}/servlet-api.jar \
- %{name}-servlet-%{servletspec}-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
+ %{__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
popd
pushd %{packdname}/output/build
@@ -316,23 +345,30 @@ pushd %{packdname}/output/build
popd
pushd ${RPM_BUILD_ROOT}%{libdir}
- # 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
+ # 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
# symlink JSP and servlet API jars
%{__ln_s} ../%{name}-jsp-%{jspspec}-api-%{version}.jar .
%{__ln_s} ../%{name}-servlet-%{servletspec}-api-%{version}.jar .
+ %{__ln_s} ../%{name}-el-%{elspec}-api-%{version}.jar
+ %{__cp} -p $(build-classpath commons-collections-tomcat5) .
+ %{__cp} -p $(build-classpath log4j) .
+ %{__ln_s} log4j log4j-%{version}.jar
+ %{__ln_s} $(build-classpath commons-dbcp-tomcat5) .
+ %{__ln_s} $(build-classpath commons-pool-tomcat5) .
+ %{__ln_s} $(build-classpath ecj) jasper-jdt.jar
popd
pushd ${RPM_BUILD_ROOT}%{bindir}
- # 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
+ # 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
popd
# symlink to the FHS locations where we've installed things
pushd ${RPM_BUILD_ROOT}%{homedir}
@@ -360,36 +396,35 @@ popd
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_mavenpomdir}
pushd %{packdname}/output/dist/src/res/maven
for file in *.pom; do
- base=`basename $file .pom`
- # Some POMs don't actually have corresponding jar files in the current RPM
- if [ $base != 'dbcp' -a $base != 'juli-adapters' -a $base != 'juli-extras' ]
- then
- sed -i 's/@MAVEN.DEPLOY.VERSION(a)/%{version}/g' $file
- %{__cp} -a $file ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-%{name}-$file
- # Some jar files have tomcat6 prepended and some don't, and some have their
- # canonical home outside of the tomcat6 subdirectory
- jppdir="JPP/%{name}"
- if [ $base = 'coyote' -o $base = 'jsp-api' -o $base = 'servlet-api' ]; then
- jpp="%{name}-$base"
- jppdir="JPP"
- else
- if [ $base = 'tribes' ]; then
- jpp=catalina-$base
- else
- if [ $base = 'juli' -o $base = 'coyote' ]; then
- jpp=tomcat-$base
- else
- jpp=$base
- fi
- fi
- fi
-
- if [ $base = 'jasper-jdt' ]; then
- %add_to_maven_depmap org.apache.tomcat $base %{version} JPP ecj 3.4.2
- else
- %add_to_maven_depmap org.apache.tomcat $base %{version} $jppdir $jpp %{version}
- fi
- fi
+ base=`basename $file .pom`
+ # Some POMs don't actually have corresponding jar files in the current RPM
+ if [ $base != 'dbcp' -a $base != 'juli-adapters' -a $base != 'juli-extras' ]; then
+ sed -i 's/@MAVEN.DEPLOY.VERSION(a)/%{version}/g' $file
+ %{__cp} -a $file ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-%{name}-$file
+ # Some jar files have tomcat6 prepended and some don't, and some have their
+ # canonical home outside of the tomcat6 subdirectory
+ jppdir="JPP/%{name}"
+ if [ $base = 'coyote' -o $base = 'jsp-api' -o $base = 'servlet-api' ]; then
+ jpp="%{name}-$base"
+ jppdir="JPP"
+ else
+ if [ $base = 'tribes' ]; then
+ jpp=catalina-$base
+ else
+ if [ $base = 'juli' -o $base = 'coyote' ]; then
+ jpp=tomcat-$base
+ else
+ jpp=$base
+ fi
+ fi
+ fi
+
+ if [ $base = 'jasper-jdt' ]; then
+ %add_to_maven_depmap org.apache.tomcat $base %{version} JPP ecj 3.4.2
+ else
+ %add_to_maven_depmap org.apache.tomcat $base %{version} $jppdir $jpp %{version}
+ fi
+ fi
done
@@ -419,6 +454,10 @@ done
%{_sbindir}/update-alternatives --install %{_javadir}/servlet.jar servlet \
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar 20500
+%post el-%{elspec}-api
+%{_sbindir}/update-alternatives --install %{_javadir}/el.jar elspec \
+ %{_javadir}/%{name}-el-%{elspec}-api.jar 20250
+
#%post webapps
# need to use -p here with b-j-r otherwise the examples webapp fails to
# load with a java.io.IOException
@@ -427,7 +466,7 @@ done
%preun
# clean tempdir and workdir on removal or upgrade
-%{__rm} -rf %{workdir}/* %{tempdir}/*
+%{__rm} -rf %{workdir} %{tempdir}
if [ "$1" = "0" ]; then
%{_initrddir}/%{name} stop >/dev/null 2>&1
/sbin/chkconfig --del %{name}
@@ -443,6 +482,9 @@ fi
%postun
%update_maven_depmap
+%{__rm} -rf %{appdir}
+%{__rm} -rf %{confdir}
+%{__rm} -rf %{libdir}
%postun jsp-%{jspspec}-api
if [ "$1" = "0" ]; then
@@ -456,40 +498,61 @@ if [ "$1" = "0" ]; then
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar
fi
+%postun el-%{elspec}-api
+if [ "$1" = "0" ]; then
+ %{_sbindir}/update-alternatives --remove elspec \
+ %{_javadir}/%{name}-el-%{elspec}-api.jar
+el-%{elspec}-api.jar
+fi
+
%files
-%defattr(0644,root,root,0755)
+%defattr(0644,root,tomcat,0775)
%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(0775,root,tomcat) %dir %{logdir}
%attr(0755,root,root) %{_initrddir}/%{name}
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
-%dir %{basedir}
-%attr(0775,root,tomcat) %dir %{appdir}
-%dir %{confdir}
-%dir %{confdir}/Catalina
-%attr(0775,root,tomcat) %dir %{confdir}/Catalina/localhost
+%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
%config(noreplace) %{confdir}/%{name}.conf
%config(noreplace) %{confdir}/*.policy
%config(noreplace) %{confdir}/*.properties
%config(noreplace) %{confdir}/context.xml
%config(noreplace) %{confdir}/server.xml
-%attr(0660,root,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml
+%attr(0664,root,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml
%config(noreplace) %{confdir}/web.xml
-%attr(0775,root,tomcat) %dir %{cachedir}
-%attr(0775,root,tomcat) %dir %{tempdir}
-%attr(0775,root,tomcat) %dir %{workdir}
-%{homedir}
+%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
%{_mavendepmapfragdir}/*
%{_mavenpomdir}/*.pom
# Exclude the POMs that are in sub-packages
%exclude %{_mavenpomdir}/*api*
%files admin-webapps
-%defattr(0644,root,root,0755)
+%defattr(0644,root,root,0775)
%{appdir}/host-manager
%{appdir}/manager
@@ -503,25 +566,45 @@ fi
%files jsp-%{jspspec}-api
%defattr(0644,root,root,0755)
-%{_javadir}/%{name}-jsp*.jar
+%{_javadir}/%{name}-jsp-%{jspspec}*.jar
%{_mavenpomdir}/JPP-%{name}-jsp-api.pom
+%files log4j
+%defattr(0644,root,tomcat,0775)
+%config(noreplace) %{confdir}/log4j.properties
+%{libdir}/log4j.jar
+%{libdir}/log4j-%{version}.jar
+
%files lib
%defattr(0644,root,root,0755)
%{libdir}
%files servlet-%{servletspec}-api
%defattr(0644,root,root,0755)
-%{_javadir}/%{name}-servlet*.jar
+%{_javadir}/%{name}-servlet-%{servletspec}*.jar
%{_mavenpomdir}/JPP-%{name}-servlet-api.pom
+%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
+
%files webapps
-%defattr(0644,root,root,0755)
+%defattr(0644,root,tomcat,0775)
%{appdir}/ROOT
%{appdir}/examples
%{appdir}/sample
%changelog
+* Tue Jun 29 2010 David Knox <dknox(a)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(a)redhat.com> 0:6.0.26-5
+- Working on 589145. Tomcat can't find java compiler for java.
+
* Tue Apr 08 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-4
- Moved build-jar-repository to later in the install process.
13 years
[tomcat: 21/66] Moved build-jar-repository to later in the install process
by Ivan Afonichev
commit fa747cfad599ae948c275cda9d174a23daf1b84f
Author: Dave Knox <dknox(a)fedoraproject.org>
Date: Thu Apr 8 23:50:29 2010 +0000
Moved build-jar-repository to later in the install process
tomcat6.spec | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/tomcat6.spec b/tomcat6.spec
index ee41815..12aac3e 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -54,7 +54,7 @@
Name: tomcat6
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: Networking/Daemons
@@ -263,12 +263,6 @@ zip -u %{packdname}/output/build/lib/jsp-api.jar META-INF/MANIFEST.MF
# move things into place
# First copy supporting libs to tomcat lib
pushd %{packdname}/output/build
- %{_bindir}/build-jar-repository lib commons-collections-tomcat5 \
- commons-dbcp-tomcat5 commons-pool-tomcat5 ecj 2>&1
-# 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
%{__cp} -a bin/*.{jar,xml} ${RPM_BUILD_ROOT}%{bindir}
%{__cp} -a conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{confdir}
%{__cp} -a lib/*.jar ${RPM_BUILD_ROOT}%{libdir}
@@ -311,6 +305,16 @@ pushd ${RPM_BUILD_ROOT}%{_javadir}
%{__ln_s} %{name}-servlet-%{servletspec}-api-%{version}.jar \
%{name}-servlet-%{servletspec}-api.jar
popd
+
+pushd %{packdname}/output/build
+ %{_bindir}/build-jar-repository lib commons-collections-tomcat5 \
+ commons-dbcp-tomcat5 commons-pool-tomcat5 ecj 2>&1
+# 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
+
pushd ${RPM_BUILD_ROOT}%{libdir}
# fix up jars to include version number
for i in *.jar; do
@@ -518,6 +522,9 @@ fi
%{appdir}/sample
%changelog
+* Tue Apr 08 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-4
+- Moved build-jar-repository to later in the install process.
+
* Tue Apr 06 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-3
- Incremented the Release tag to 3 to avoid any confusion about which
- is the most recent
13 years
[tomcat: 20/66] Incrementing the Release tag to 3 and avoid any confusion about which is the most recent.
by Ivan Afonichev
commit 41fbc279fedc9d456dd6bef82af910a7356a43b3
Author: Dave Knox <dknox(a)fedoraproject.org>
Date: Tue Apr 6 19:21:45 2010 +0000
Incrementing the Release tag to 3 and avoid any confusion about which is
the most recent.
tomcat6.spec | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/tomcat6.spec b/tomcat6.spec
index 2eb8bf0..ee41815 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -54,7 +54,7 @@
Name: tomcat6
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: Networking/Daemons
@@ -518,12 +518,16 @@ fi
%{appdir}/sample
%changelog
+* Tue Apr 06 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-3
+- Incremented the Release tag to 3 to avoid any confusion about which
+- is the most recent
+
* Tue Apr 06 2010 David Knox <dknox(a)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
-* Mon Mar 29 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-1
+* Mon Mar 29 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-2
- Update source to tomcat6.0.26
- Bugzilla 572357 - Please retest.
- OSGi manifests for servlet-api and jsp-api
13 years
[tomcat: 19/66] Adding Requires and BuildRequires for taglibs-standard.
by Ivan Afonichev
commit d71f0340a9b0c7870cba754246f1acb5ec954dd0
Author: Dave Knox <dknox(a)fedoraproject.org>
Date: Tue Apr 6 19:02:40 2010 +0000
Adding Requires and BuildRequires for taglibs-standard.
tomcat6.spec | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
---
diff --git a/tomcat6.spec b/tomcat6.spec
index 6835cb2..2eb8bf0 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -54,7 +54,7 @@
Name: tomcat6
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: Networking/Daemons
@@ -80,7 +80,11 @@ BuildRequires: ant-trax
BuildRequires: ecj
BuildRequires: findutils
BuildRequires: jakarta-commons-collections
+BuildRequires: jakarta-commons-collections-tomcat5
BuildRequires: jakarta-commons-daemon
+BuildRequires: jakarta-commons-dbcp-tomcat5
+BuildRequires: jakarta-commons-pool-tomcat5
+BuildRequires: jakarta-taglibs-standard
BuildRequires: java-1.6.0-devel
BuildRequires: jpackage-utils >= 0:1.7.0
BuildRequires: junit
@@ -148,10 +152,10 @@ 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}
-Requires(post): ecj
-Requires(post): jakarta-commons-collections-tomcat5
-Requires(post): jakarta-commons-dbcp-tomcat5
-Requires(post): jakarta-commons-pool-tomcat5
+Requires: ecj
+Requires: jakarta-commons-collections-tomcat5
+Requires: jakarta-commons-dbcp-tomcat5
+Requires: jakarta-commons-pool-tomcat5
Requires(preun): coreutils
%description lib
@@ -173,7 +177,7 @@ Apache Tomcat Servlet API implementation classes.
Group: System Environment/Applications
Summary: The ROOT and examples web applications for Apache Tomcat
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires(post): jakarta-taglibs-standard >= 0:1.1
+Requires: jakarta-taglibs-standard >= 0:1.1
%description webapps
The ROOT and examples web applications for Apache Tomcat.
@@ -514,7 +518,12 @@ fi
%{appdir}/sample
%changelog
-* Mon Mar 29 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-2
+* Tue Apr 06 2010 David Knox <dknox(a)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
+
+* Mon Mar 29 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-1
- Update source to tomcat6.0.26
- Bugzilla 572357 - Please retest.
- OSGi manifests for servlet-api and jsp-api
13 years
[tomcat: 18/66] Had to rework this patch because of changes to the manifest between 6.0.24 and 6.0.26.
by Ivan Afonichev
commit ec08b5cb2f55e363df39b82f405ad1df9529c068
Author: Dave Knox <dknox(a)fedoraproject.org>
Date: Tue Apr 6 17:03:31 2010 +0000
Had to rework this patch because of changes to the manifest between 6.0.24
and 6.0.26.
tomcat6-6.0-bootstrap-MANIFEST.MF.patch | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/tomcat6-6.0-bootstrap-MANIFEST.MF.patch b/tomcat6-6.0-bootstrap-MANIFEST.MF.patch
index 85ee302..ac94aac 100644
--- a/tomcat6-6.0-bootstrap-MANIFEST.MF.patch
+++ b/tomcat6-6.0-bootstrap-MANIFEST.MF.patch
@@ -1,9 +1,9 @@
---- res/META-INF/bootstrap.jar.manifest.orig 2010-01-19 15:43:41.000000000 +0200
-+++ res/META-INF/bootstrap.jar.manifest 2010-03-01 12:42:57.993559599 +0200
-@@ -1,5 +1,4 @@
+--- res/META-INF/bootstrap.jar.manifest.orig 2010-04-06 10:11:09.000000000 -0600
++++ res/META-INF/bootstrap.jar.manifest 2010-04-06 10:45:56.000000000 -0600
+@@ -1,6 +1,5 @@
Manifest-Version: 1.0
Main-Class: org.apache.catalina.startup.Bootstrap
-Class-Path: commons-daemon.jar tomcat-juli.jar
- Specification-Title: Catalina
- Specification-Version: 6.0
-\ No newline at end of file
+ Specification-Title: Apache Tomcat Bootstrap
+ Specification-Version: @VERSION_MAJOR_MINOR@
+ Specification-Vendor: Apache Software Foundation
13 years
[tomcat: 17/66] Source0 updated to tomcat 6.0.26. OSGi manifests for servlet-api and jsp-api.
by Ivan Afonichev
commit 2cdbc959211863f63e3b1d45d6baf1d554c266f0
Author: Dave Knox <dknox(a)fedoraproject.org>
Date: Mon Mar 29 17:59:55 2010 +0000
Source0 updated to tomcat 6.0.26. OSGi manifests for servlet-api and
jsp-api.
.cvsignore | 1 +
sources | 1 +
tomcat6.spec | 78 ++++++++++++++++++++++++++++++++++-----------------------
3 files changed, 48 insertions(+), 32 deletions(-)
---
diff --git a/.cvsignore b/.cvsignore
index ddf7ad7..15a50ac 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
apache-tomcat-6.0.18-src.tar.gz
apache-tomcat-6.0.20-src.tar.gz
apache-tomcat-6.0.24-src.tar.gz
+apache-tomcat-6.0.26-src.tar.gz
diff --git a/sources b/sources
index 27e80a8..ddb95cc 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
543218290008e0dd6a329f69136973ca apache-tomcat-6.0.24-src.tar.gz
+83b46d9346bcbc517dbf6f1cac9ef8b1 apache-tomcat-6.0.26-src.tar.gz
diff --git a/tomcat6.spec b/tomcat6.spec
index 1f76dda..6835cb2 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -28,28 +28,28 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define section free
+%global section free
-%define jspspec 2.1
-%define major_version 6
-%define minor_version 0
-%define micro_version 24
-%define packdname apache-tomcat-%{version}-src
-%define servletspec 2.5
-%define tcuid 91
+%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
+%global tcuid 91
# FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/
-%define basedir %{_var}/lib/%{name}
-%define appdir %{basedir}/webapps
-%define bindir %{_datadir}/%{name}/bin
-%define confdir %{_sysconfdir}/%{name}
-%define homedir %{_datadir}/%{name}
-%define libdir %{_javadir}/%{name}
-%define logdir %{_var}/log/%{name}
-%define cachedir %{_var}/cache/%{name}
-%define tempdir %{cachedir}/temp
-%define workdir %{cachedir}/work
-%define _initrddir %{_sysconfdir}/init.d
+%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
Name: tomcat6
Epoch: 0
@@ -255,8 +255,16 @@ zip -u %{packdname}/output/build/lib/jsp-api.jar META-INF/MANIFEST.MF
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{homedir}
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{tempdir}
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{workdir}
+
# move things into place
+# First copy supporting libs to tomcat lib
pushd %{packdname}/output/build
+ %{_bindir}/build-jar-repository lib commons-collections-tomcat5 \
+ commons-dbcp-tomcat5 commons-pool-tomcat5 ecj 2>&1
+# 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
%{__cp} -a bin/*.{jar,xml} ${RPM_BUILD_ROOT}%{bindir}
%{__cp} -a conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{confdir}
%{__cp} -a lib/*.jar ${RPM_BUILD_ROOT}%{libdir}
@@ -395,19 +403,19 @@ done
%{_sbindir}/update-alternatives --install %{_javadir}/jsp.jar jsp \
%{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20100
-%post lib
-%{_bindir}/build-jar-repository %{libdir} commons-collections-tomcat5 \
- commons-dbcp-tomcat5 commons-pool-tomcat5 ecj 2>&1
+#%post lib
+#%{_bindir}/build-jar-repository %{libdir} commons-collections-tomcat5 \
+# commons-dbcp-tomcat5 commons-pool-tomcat5 ecj 2>&1
%post servlet-%{servletspec}-api
%{_sbindir}/update-alternatives --install %{_javadir}/servlet.jar servlet \
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar 20500
-%post webapps
+#%post webapps
# 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 %{appdir}/examples/WEB-INF/lib \
- taglibs-core.jar taglibs-standard.jar 2>&1
+#%{_bindir}/build-jar-repository -p %{appdir}/examples/WEB-INF/lib \
+# taglibs-core.jar taglibs-standard.jar 2>&1
%preun
# clean tempdir and workdir on removal or upgrade
@@ -417,13 +425,13 @@ if [ "$1" = "0" ]; then
/sbin/chkconfig --del %{name}
fi
-%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
+#%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
%postun
%update_maven_depmap
@@ -506,6 +514,12 @@ fi
%{appdir}/sample
%changelog
+* Mon Mar 29 2010 David Knox <dknox(a)redhat.com> 0:6.0.26-2
+- Update source to tomcat6.0.26
+- Bugzilla 572357 - Please retest.
+- OSGi manifests for servlet-api and jsp-api
+
+
* Fri Mar 26 2010 Mary Ellen Foster <mefoster(a)gmail.com> 0:6.0.24-2
- Add maven POMs and metadata
- Link tomcat6-juli into /usr/share/java/tomcat6
13 years
[tomcat: 16/66] Linking tomcat-juli instead of copying
by Ivan Afonichev
commit 850f211a6449b2a5b331ecb93c936b9930c4af6e
Author: mef <mef(a)fedoraproject.org>
Date: Fri Mar 26 17:12:38 2010 +0000
Linking tomcat-juli instead of copying
tomcat6.spec | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/tomcat6.spec b/tomcat6.spec
index 5289d57..1f76dda 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -260,8 +260,6 @@ pushd %{packdname}/output/build
%{__cp} -a bin/*.{jar,xml} ${RPM_BUILD_ROOT}%{bindir}
%{__cp} -a conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{confdir}
%{__cp} -a lib/*.jar ${RPM_BUILD_ROOT}%{libdir}
- # Put the juli jar under /usr/share/java/ too
- %{__cp} -a bin/tomcat-juli*.jar ${RPM_BUILD_ROOT}%{libdir}
%{__cp} -a webapps/* ${RPM_BUILD_ROOT}%{appdir}
popd
# javadoc
@@ -337,6 +335,11 @@ pushd ${RPM_BUILD_ROOT}%{appdir}/sample
popd
%{__rm} ${RPM_BUILD_ROOT}%{appdir}/docs/appdev/sample/sample.war
+# Link the juli jars into /usr/share/java/tomcat6
+pushd ${RPM_BUILD_ROOT}%{libdir}
+%{__ln_s} %{bindir}/tomcat-juli* .
+popd
+
# Install the maven metadata
%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_mavenpomdir}
pushd %{packdname}/output/dist/src/res/maven
@@ -505,7 +508,7 @@ fi
%changelog
* Fri Mar 26 2010 Mary Ellen Foster <mefoster(a)gmail.com> 0:6.0.24-2
- Add maven POMs and metadata
-- Copy tomcat6-juli into /usr/share/java/tomcat6
+- Link tomcat6-juli into /usr/share/java/tomcat6
* Mon Mar 1 2010 Alexander Kurtakov <akurtako(a)redhat.com> 0:6.0.24-1
- Update to 6.0.24.
13 years