Mailinglist Archive: opensuse-commit (1421 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package tomcat6
checked in at Tue May 6 19:00:48 CEST 2008.


--------
--- tomcat6/tomcat6.changes     2008-02-27 10:53:57.000000000 +0100
+++ /mounts/work_src_done/NOARCH/tomcat6/tomcat6.changes        2008-05-06 
10:13:04.000000000 +0200
@@ -1,0 +2,14 @@
+Tue May  6 10:12:07 CEST 2008 - mvyskocil@xxxxxxx
+
+- fixed a [bnc#383331] - Tomcat cannot compile JSPs
+  - add a ecj requires for tomcat6-lib
+  - create a symlink of ecj.jar to tomcat6 libdir
+- add a jakarta-taglibs-standard to BuildRequires
+- use a fdupes to avoid a file duplication waste in /srv
+- replace a %{_jvmdir}/jre to /etc/alternatives/jre in JAVAHOME in default
+  tomcat6.conf (this path is architecture independent)
+- add a %stop_on_removal to %preun, %restart_on_update and %insserv_cleanup to
+  %postun to fix some rpmlint warnings
+- add a $remote_fs dependency to init script
+
+-------------------------------------------------------------------



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ tomcat6.spec ++++++
--- /var/tmp/diff_new_pack.nl3872/_old  2008-05-06 18:59:43.000000000 +0200
+++ /var/tmp/diff_new_pack.nl3872/_new  2008-05-06 18:59:43.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package tomcat6 (Version 0)
+# spec file for package tomcat6 (Version MACRO)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -29,7 +29,7 @@
 
 Name:           tomcat6
 Version:        %{major_version}.%{minor_version}.%{macro_version}
-Release:        1
+Release:        5
 Summary:        Apache Servlet/JSP Engine, RI for Servlet 2.5/JSP 2.1 API
 Group:          Productivity/Networking/Web/Servers
 License:        The Apache Software License
@@ -54,6 +54,8 @@
 BuildRequires:  sed
 %if %defined suse_version
 BuildRequires:  unzip
+BuildRequires:  jakarta-taglibs-standard >= 1.1
+BuildRequires:  fdupes
 PreReq:         %fillup_prereq
 %endif
 Requires(pre): %{_sbindir}/groupadd
@@ -78,6 +80,7 @@
 
 
 %package admin-webapps
+License:        The Apache Software License
 Group:          Productivity/Networking/Web/Servers
 Summary:        The host-manager and manager web applications for Apache Tomcat
 Requires:       %{name} = %{version}-%{release}
@@ -88,6 +91,7 @@
 
 
 %package docs-webapp
+License:        The Apache Software License
 Group:          Productivity/Networking/Web/Servers
 Summary:        The docs web application for Apache Tomcat
 Requires:       %{name} = %{version}-%{release}
@@ -98,6 +102,7 @@
 
 
 %package javadoc
+License:        The Apache Software License
 Group:          Productivity/Networking/Web/Servers
 Summary:        Javadoc generated documentation for Apache Tomcat
 
@@ -107,6 +112,7 @@
 
 
 %package jsp-2_1-api
+License:        The Apache Software License
 Group:          Productivity/Networking/Web/Servers
 Summary:        Apache Tomcat JSP API implementation classes
 Provides:       %{name}-jsp-2.1-api
@@ -120,12 +126,13 @@
 
 
 %package lib
+License:        The Apache Software License
 Group:          Productivity/Networking/Web/Servers
 Summary:        Libraries needed to run the Tomcat Web container
 Requires:       %{name}-jsp-2_1-api = %{version}-%{release}
 Requires:       %{name}-servlet-2_5-api = %{version}-%{release}
-%if ! %defined suse_version
 Requires(post): ecj >= 3.2.2
+%if ! %defined suse_version
 Requires(post): jakarta-commons-collections-tomcat5
 Requires(post): jakarta-commons-dbcp-tomcat5
 Requires(post): jakarta-commons-pool-tomcat5
@@ -138,6 +145,7 @@
 
 
 %package servlet-2_5-api
+License:        The Apache Software License
 Group:          Productivity/Networking/Web/Servers
 Summary:        Apache Tomcat Servlet API implementation classes
 Provides:       %{name}-servlet-2.5-api
@@ -150,6 +158,7 @@
 
 
 %package webapps
+License:        The Apache Software License
 Group:          Productivity/Networking/Web/Servers
 Summary:        The ROOT and examples web applications for Apache Tomcat
 Requires:       %{name} = %{version}-%{release}
@@ -236,7 +245,7 @@
 %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
          -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" %{SOURCE1} \
 %if %defined suse_version
-         -e "s|\@\@\@JAVAHOME\@\@\@|%{_jvmdir}/jre|g" \
+         -e "s|\@\@\@JAVAHOME\@\@\@|/etc/alternatives/jre|g" \
 %endif
     > ${RPM_BUILD_ROOT}%{confdir}/%{name}.conf
 %if %defined suse_version
@@ -289,6 +298,9 @@
     %{__ln_s} %{tempdir} temp
     %{__ln_s} %{workdir} work
 popd
+%if %defined suse_version
+%fdupes $RPM_BUILD_ROOT /srv/%{name}
+%endif
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -316,39 +328,51 @@
 %post jsp-2_1-api
 %{_sbindir}/update-alternatives --install %{_javadir}/jsp.jar jsp \
     %{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20100
-%if ! %defined suse_version
 
 %post lib
-build-jar-repository %{libdir} commons-collections-tomcat5 \
-    commons-dbcp-tomcat5 commons-pool-tomcat5 ecj 2>&1
+build-jar-repository %{libdir} \
+%if ! %defined suse_version
+        commons-collections-tomcat5 \
+        commons-dbcp-tomcat5 \
+        commons-pool-tomcat5 \
 %endif
+        ecj 2>&1
 
 %post servlet-2_5-api
 %{_sbindir}/update-alternatives --install %{_javadir}/servlet.jar servlet \
     %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 20500
-%if ! %defined suse_version
 
 %post webapps
 build-jar-repository %{appdir}/examples/WEB-INF/lib \
     taglibs-core.jar taglibs-standard.jar 2>&1
-%endif
 
 %preun
 # clean tempdir and workdir on removal or upgrade
 %{__rm} -fr %{workdir}/* %{tempdir}/*
+%if %defined suse_version
+%stop_on_removal %{name}
+%else
 if [ "$1" = "0" ]; then
     [ -f /var/lock/subsys/%{name} ] && %{_sysconfdir}/init.d/%{name} stop
     [ -f %{_sysconfdir}/init.d/%{name} ] && /sbin/chkconfig --del %{name}
 fi
-%if ! %defined suse_version
+%endif
 
 %preun lib
 if [ "$1" = "0" ]; then
-    %{__rm} -f %{libdir}/\[commons-collections-tomcat5\].jar \
+    %{__rm} -f \
+%if ! %defined suse_version
+        %{libdir}/\[commons-collections-tomcat5\].jar \
         %{libdir}/\[commons-dbcp-tomcat5\].jar \
         %{libdir}/\[commons-pool-tomcat5\].jar \
+%endif
         %{libdir}/\[ecj\].jar >/dev/null 2>&1
 fi
+%if %defined suse_version
+
+%postun
+%restart_on_update %{name}
+%insserv_cleanup
 %endif
 
 %postun jsp-2_1-api
@@ -421,6 +445,17 @@
 %{appdir}/examples
 
 %changelog
+* Tue May 06 2008 mvyskocil@xxxxxxx
+- fixed a [bnc#383331] - Tomcat cannot compile JSPs
+  - add a ecj requires for tomcat6-lib
+  - create a symlink of ecj.jar to tomcat6 libdir
+- add a jakarta-taglibs-standard to BuildRequires
+- use a fdupes to avoid a file duplication waste in /srv
+- replace a %%{_jvmdir}/jre to /etc/alternatives/jre in JAVAHOME in default
+  tomcat6.conf (this path is architecture independent)
+- add a %%stop_on_removal to %%preun, %%restart_on_update and 
%%insserv_cleanup to
+  %%postun to fix some rpmlint warnings
+- add a $remote_fs dependency to init script
 * Wed Feb 27 2008 mvyskocil@xxxxxxx
 - update to 6.0.16
 * Fri Jan 25 2008 coolo@xxxxxxx


++++++ tomcat6-6.0.init ++++++
--- tomcat6/tomcat6-6.0.init    2007-11-13 14:21:58.000000000 +0100
+++ /mounts/work_src_done/NOARCH/tomcat6/tomcat6-6.0.init       2008-05-05 
15:59:29.000000000 +0200
@@ -6,7 +6,7 @@
 #
 ### BEGIN INIT INFO
 # Provides: tomcat6
-# Required-Start: $network $syslog
+# Required-Start: $network $syslog $remote_fs
 # Required-Stop: $network $syslog
 # Default-Start:
 # Default-Stop:




++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx