Hello community,
here is the log from the commit of package tomcat55
checked in at Wed Mar 7 23:22:40 CET 2007.
--------
--- tomcat55/tomcat55.changes 2007-01-12 14:36:40.000000000 +0100
+++ /mounts/work_src_done/NOARCH/tomcat55/tomcat55.changes 2007-03-06 17:25:04.000000000 +0100
@@ -1,0 +2,9 @@
+Mon Feb 5 17:38:57 CET 2007 - kesselborn@suse.de
+
+- autobuild has problems with '.' in package name: changed sub package names
+- added /etc/init.d/tomcat55 script
+- added /usr/sbin/rctomcat55 link
+- added /etc/sysconfig/tomcat55 file
+- added tomcat base directory
+
+-------------------------------------------------------------------
Old:
----
tomcat55-5.5.conf
New:
----
sysconfig.j2ee-tomcat5
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tomcat55.spec ++++++
--- /var/tmp/diff_new_pack.J27409/_old 2007-03-07 23:22:23.000000000 +0100
+++ /var/tmp/diff_new_pack.J27409/_new 2007-03-07 23:22:23.000000000 +0100
@@ -63,16 +63,18 @@
%define serverdir %{_localstatedir}/lib/%{name}/server
%define commondir %{_localstatedir}/lib/%{name}/common
%define shareddir %{_localstatedir}/lib/%{name}/shared
+%define base_parent /srv/www/
+%define catalina_base %{base_parent}/%{name}/base
Summary: The Apache Tomcat Servlet Container
Version: 5.5.20
-Release: 1
+Release: 8
License: BSD License and BSD-like, The Apache Software License
Group: Productivity/Networking/Web/Frontends
URL: http://tomcat.apache.org
BuildArch: noarch
Source0: apache-tomcat-%{version}-src.tar.bz2
Source1: %{name}-%{majversion}.init
-Source2: %{name}-%{majversion}.conf
+Source2: sysconfig.j2ee-tomcat5
Source3: %{name}-%{majversion}.wrapper
Source4: %{name}-%{majversion}.logrotate
Source5: %{name}-%{majversion}.relink
@@ -108,8 +110,9 @@
Requires: %{name}-common-lib = %{version}-%{release}
Requires: %{name}-server-lib = %{version}-%{release}
# And it needs its own API subpackages before being installed
-Requires(post): %{name}-common-lib = %{version}-%{release}
-Requires(post): %{name}-server-lib = %{version}-%{release}
+PreReq: %{name}-common-lib = %{version}-%{release}
+PreReq: %{name}-server-lib = %{version}-%{release}
+PreReq: %fillup_prereq
%description
Apache Tomcat is the servlet container that is used in the official
@@ -359,7 +362,7 @@
William A. Rowe Jr.
Yoav Shapira
-%package servlet-2.4-api
+%package servlet-2_4-api
Group: Development/Libraries/Java
Requires: /usr/sbin/update-alternatives
Summary: Java servlet implementation classes
@@ -367,19 +370,23 @@
Provides: servlet5
Provides: servlet24
Provides: servletapi55
+Provides: servlet-%{servletspec}-api = %{version}-%{release}
+Provides: %{name}-servlet-%{servletspec}-api = %{version}-%{release}
-%description servlet-2.4-api
+%description servlet-2_4-api
This subproject contains the source code for the implementation classes
of the Java Servlet and JSP APIs (packages javax.servlet).
-%package servlet-2.4-api-javadoc
+%package servlet-2_4-api-javadoc
Group: Documentation/Other
Summary: Javadoc for servletapi5
Provides: servletapi55-javadoc
+Provides: servlet-%{servletspec}-api-javadoc = %{version}-%{release}
+Provides: %{name}-servlet-%{servletspec}-api-javadoc = %{version}-%{release}
-%description servlet-2.4-api-javadoc
+%description servlet-2_4-api-javadoc
This subproject contains the source code for the implementation classes
of the Java Servlet and JSP APIs (packages javax.servlet).
@@ -388,7 +395,7 @@
-%package jsp-2.0-api
+%package jsp-2_0-api
Group: Productivity/Networking/Web/Frontends
Requires: /usr/sbin/update-alternatives
Requires: servlet24
@@ -397,8 +404,10 @@
PreReq: %{name}-servlet-%{servletspec}-api = %{version}-%{release}
Summary: Api documentation ofJava Server Pages (JSP) implementation classes
Provides: jsp
+Provides: jsp-%{jspspec}-api = %{version}-%{release}
+Provides: %{name}-jsp-%{jspspec}-api = %{version}-%{release}
-%description jsp-2.0-api
+%description jsp-2_0-api
Contains the JavaDoc api documentation of the classes of the Jakarta
Tomcat JSP API (packages javax.servlet.jsp).
@@ -476,11 +485,13 @@
William A. Rowe Jr.
Yoav Shapira
-%package jsp-2.0-api-javadoc
+%package jsp-2_0-api-javadoc
Group: Documentation/Other
Summary: Java Server Pages (JSP) implementation classes
+Provides: jsp-%{jspspec}-api-javadoc = %{version}-%{release}
+Provides: %{name}-jsp-%{jspspec}-api-javadoc = %{version}-%{release}
-%description jsp-2.0-api-javadoc
+%description jsp-2_0-api-javadoc
Contains the implementation classes of the Jakarta Tomcat JSP API
(packages javax.servlet.jsp).
@@ -562,41 +573,41 @@
Group: Productivity/Networking/Web/Frontends
Summary: Tomcat 5.5 server libs
Requires: java >= 1.4.2
-Requires(post): jpackage-utils >= 1.6.0
+PreReq: jpackage-utils >= 1.6.0
Requires: ant >= 1.6
-Requires(post): ant >= 1.6
+PreReq: ant >= 1.6
Requires: jakarta-commons-collections >= 3.1
-Requires(post): jakarta-commons-collections >= 3.1
+PreReq: jakarta-commons-collections >= 3.1
Requires: jakarta-commons-dbcp >= 1.2.1
-Requires(post): jakarta-commons-dbcp >= 1.2.1
+PreReq: jakarta-commons-dbcp >= 1.2.1
Requires: jakarta-commons-el >= 1.0
-Requires(post): jakarta-commons-el >= 1.0
+PreReq: jakarta-commons-el >= 1.0
Requires: jakarta-commons-logging >= 1.0.4
-Requires(post): jakarta-commons-logging >= 1.0.4
+PreReq: jakarta-commons-logging >= 1.0.4
# FIXME commons-pool is not listed in the Tomcat build.properties.default
Requires: jakarta-commons-pool >= 1.2
-Requires(post): jakarta-commons-pool >= 1.2
+PreReq: jakarta-commons-pool >= 1.2
# jaf can be provided by classpathx-jaf
Requires: jaf >= 1.0.1
-Requires(post): jaf >= 1.0.1
+PreReq: jaf >= 1.0.1
# javamail can be provided by classpathx-mail
Requires: javamail >= 1.3.1
-Requires(post): javamail >= 1.3.1
+PreReq: javamail >= 1.3.1
Requires: jdbc-stdext
-Requires(post): jdbc-stdext
+PreReq: jdbc-stdext
Requires: jndi
-Requires(post): jndi
+PreReq: jndi
# generic jta Requires
Requires: jta
-Requires(post): jta
+PreReq: jta
Requires: mx4j >= 3.0.1
-Requires(post): mx4j >= 3.0.1
+PreReq: mx4j >= 3.0.1
Requires: eclipse-ecj >= 3.1.1
-Requires(post): eclipse-ecj >= 3.1.1
+PreReq: eclipse-ecj >= 3.1.1
# Other subpackages must go in first
-Requires(post): %{name}-servlet-%{servletspec}-api = %{version}-%{release}
-Requires(post): %{name}-jsp-%{jspspec}-api = %{version}-%{release}
-Requires(post): %{name}-%{jname} = %{version}-%{release}
+PreReq: %{name}-servlet-%{servletspec}-api = %{version}-%{release}
+PreReq: %{name}-jsp-%{jspspec}-api = %{version}-%{release}
+PreReq: %{name}-%{jname} = %{version}-%{release}
Requires: %{name}-servlet-%{servletspec}-api = %{version}-%{release}
Requires: %{name}-jsp-%{jspspec}-api = %{version}-%{release}
Requires: %{name}-%{jname} = %{version}-%{release}
@@ -681,28 +692,28 @@
%package server-lib
Group: Productivity/Networking/Web/Frontends
Summary: Tomcat 5.5 common libs
-Requires(post): jpackage-utils >= 1.6.0
+PreReq: jpackage-utils >= 1.6.0
Requires: jakarta-commons-beanutils >= 1.7.0
-Requires(post): jakarta-commons-beanutils >= 1.7.0
+PreReq: jakarta-commons-beanutils >= 1.7.0
Requires: jakarta-commons-digester >= 1.6
-Requires(post): jakarta-commons-digester >= 1.6
+PreReq: jakarta-commons-digester >= 1.6
Requires: jakarta-commons-el >= 1.0
-Requires(post): jakarta-commons-el >= 1.0
+PreReq: jakarta-commons-el >= 1.0
Requires: jakarta-commons-fileupload >= 1.0-1jpp
-Requires(post): jakarta-commons-fileupload >= 1.0-1jpp
+PreReq: jakarta-commons-fileupload >= 1.0-1jpp
Requires: jakarta-commons-logging >= 1.0.4
-Requires(post): jakarta-commons-logging >= 1.0.4
+PreReq: jakarta-commons-logging >= 1.0.4
Requires: jakarta-commons-modeler >= 1.1
-Requires(post): jakarta-commons-modeler >= 1.1
+PreReq: jakarta-commons-modeler >= 1.1
Requires: jaas
-Requires(post): jaas
+PreReq: jaas
Requires: mx4j >= 3.0.1
-Requires(post): mx4j >= 3.0.1
+PreReq: mx4j >= 3.0.1
Requires: regexp >= 1.3
-Requires(post): regexp >= 1.3
+PreReq: regexp >= 1.3
# Other subpackages must go in first
Requires: %{name}-%{jname} = %{version}-%{release}
-Requires(post): %{name}-%{jname} = %{version}-%{release}
+PreReq: %{name}-%{jname} = %{version}-%{release}
%description server-lib
Some of the libraries needed to run tomcat55 (common libs).
@@ -962,11 +973,12 @@
install -d -m 755 $RPM_BUILD_ROOT{%{appdir},%{commondir},%{shareddir}}
install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/{init.d,logrotate.d}
install -d -m 755 $RPM_BUILD_ROOT{%{_bindir},%{_javadir}}
+install -d -m 755 $RPM_BUILD_ROOT/%{_sbindir}
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
install -m 755 %{SOURCE5} $RPM_BUILD_ROOT/%{bindir}/relink
# SysV init and configuration
install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}
-install %{SOURCE2} $RPM_BUILD_ROOT%{confdir}/%{name}.conf
+ln -sf %{_sysconfdir}/init.d/%{name} $RPM_BUILD_ROOT/%{_sbindir}/rc%{name}
pushd $RPM_BUILD_DIR/%{name}-%{version}/%{packdname}/build
export usejikes=false
export OPT_JAR_LIST="ant/ant-trax"
@@ -1009,15 +1021,14 @@
# Remove leftover files
rm -f $RPM_BUILD_ROOT%{bindir}/*.orig
# install wrapper as tomcat55
-install %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/%{name}
+#install %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/%{name}
# install logrotate support
install %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}
# remove / reorder non-usefull stuff
rm -rf $RPM_BUILD_ROOT%{homedir}/src/
-rm -f $RPM_BUILD_ROOT%{bindir}/*.sh $RPM_BUILD_ROOT%{bindir}/*.bat
+rm -f $RPM_BUILD_ROOT%{bindir}/*.bat
# FHS compliance patches, not easy to track them all boys :)
-for i in $RPM_BUILD_ROOT%{confdir}/%{name}.conf \
- $RPM_BUILD_ROOT%{_bindir}/d%{name} \
+for i in $RPM_BUILD_ROOT%{_bindir}/d%{name} \
$RPM_BUILD_ROOT%{_bindir}/%{name} \
$RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name} \
$RPM_BUILD_ROOT%{bindir}/relink \
@@ -1198,6 +1209,17 @@
# ghost symlink
ln -s %{jname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{full_jname}
popd
+install -d -m755 $RPM_BUILD_ROOT/%{catalina_base}
+pushd $RPM_BUILD_ROOT/%{catalina_base}
+for file in bin common conf logs server shared temp webapps work
+do
+ ln -sf %{homedir}/$file .
+done
+popd
+install -m 755 -d $RPM_BUILD_ROOT%{_var}/adm/fillup-templates/
+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_var}/adm/fillup-templates/
+# ghost
+touch $RPM_BUILD_ROOT/%{confdir}/%{name}.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -1220,6 +1242,9 @@
build-jar-repository %{commondir}/endorsed jaxp_parser_impl \
xml-commons-apis 2>&1
build-jar-repository %{bindir} mx4j/mx4j 2>&1
+%{fillup_and_insserv -f -s tomcat55 START_TOMCAT}
+%{fillup_only}
+ln -sf %{_sysconfdir}/sysconfig/%{name} %{confdir}/%{name}.conf
%post common-lib
# Create automated links - since all needed extensions may not have been
@@ -1289,33 +1314,33 @@
-not -name 'catalina-admin*' -not -type d | xargs rm -f
build-jar-repository %{serverdir}/webapps/admin/WEB-INF/lib struts 2>&1
-%post servlet-%{servletspec}-api
+%post servlet-2_4-api
update-alternatives --install %{_javadir}/servlet.jar servlet \
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar 20400
-%post servlet-%{servletspec}-api-javadoc
+%post servlet-2_4-api-javadoc
rm -f %{_javadocdir}/servletapi # legacy symlink
rm -f %{_javadocdir}/%{name}-servlet-%{servletspec}-api
ln -s %{name}-servlet-%{servletspec}-api-%{version} \
%{_javadocdir}/%{name}-servlet-%{servletspec}-api
-%postun servlet-%{servletspec}-api
+%postun servlet-2_4-api
if [ "$1" = "0" ]; then
update-alternatives --remove servlet \
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar
fi
-%post jsp-%{jspspec}-api
+%post jsp-2_0-api
update-alternatives --install %{_javadir}/jsp.jar jsp \
%{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20000
-%post jsp-%{jspspec}-api-javadoc
+%post jsp-2_0-api-javadoc
rm -f %{_javadocdir}/jsp-api # legacy symlink
rm -f %{_javadocdir}/%{name}-jsp-%{jspspec}-api
ln -s %{name}-jsp-%{jspspec}-api-%{version} \
%{_javadocdir}/%{name}-jsp-%{jspspec}-api
-%postun jsp-%{jspspec}-api
+%postun jsp-2_0-api
if [ "$1" = "0" ]; then
update-alternatives --remove jsp \
%{_javadir}/%{name}-jsp-%{jspspec}-api.jar
@@ -1438,6 +1463,9 @@
%config(noreplace) %{confdir}/workers2.properties.minimal
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%{commondir}/i18n/*
+%{base_parent}/*
+%{_sbindir}/*
+%{_var}/adm/fillup-templates/*
%files common-lib
%defattr(644,root,root,755)
@@ -1497,29 +1525,35 @@
%{_javadocdir}/%{jname}-%{version}
%ghost %doc %{_javadocdir}/%{full_jname}
-%files servlet-%{servletspec}-api
+%files servlet-2_4-api
%defattr(-,root,root)
%doc %{packdname}/build/LICENSE
%{_javadir}/%{name}-servlet-%{servletspec}-api*.jar
%{_javadir}/servletapi55.jar
-%files servlet-%{servletspec}-api-javadoc
+%files servlet-2_4-api-javadoc
%defattr(-,root,root)
%doc %{_javadocdir}/%{name}-servlet-%{servletspec}-api-%{version}
%ghost %doc %{_javadocdir}/%{name}-servlet-%{servletspec}-api
-%files jsp-%{jspspec}-api
+%files jsp-2_0-api
%defattr(-,root,root)
%doc %{packdname}/build/LICENSE
%{_javadir}/%{name}-jsp-%{jspspec}-api*.jar
%{_javadir}/jspapi55.jar
-%files jsp-%{jspspec}-api-javadoc
+%files jsp-2_0-api-javadoc
%defattr(-,root,root)
%doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api-%{version}
%ghost %doc %{_javadocdir}/%{name}-jsp-%{jspspec}-api
-%changelog -n tomcat55
+%changelog
+* Mon Feb 05 2007 - kesselborn@suse.de
+- autobuild has problems with '.' in package name: changed sub package names
+- added /etc/init.d/tomcat55 script
+- added /usr/sbin/rctomcat55 link
+- added /etc/sysconfig/tomcat55 file
+- added tomcat base directory
* Fri Jan 12 2007 - dbornkessel@suse.de
- first version for autobuild
* Tue Nov 07 2006 - dbornkessel@suse.de
++++++ tomcat55-5.5.init ++++++
--- tomcat55/tomcat55-5.5.init 2006-11-10 16:39:04.000000000 +0100
+++ /mounts/work_src_done/NOARCH/tomcat55/tomcat55-5.5.init 2007-03-06 15:17:54.000000000 +0100
@@ -1,180 +1,284 @@
-#!/bin/sh
+#! /bin/sh
+# Copyright (c) 1995-2001 SuSE GmbH Nuernberg, Germany.
+# Copyright (c) 2002 SuSE Linux AG Nuernberg, Germany.
#
-# Startup script for Tomcat 5.5, the Apache Servlet Engine
+# Author: Petr Mladek
participants (1)
-
root@Hilbert.suse.de