Hello community, here is the log from the commit of package tomcat5 checked in at Thu Apr 20 01:04:30 CEST 2006. -------- --- tomcat5/tomcat5.changes 2006-03-27 18:26:40.000000000 +0200 +++ NOARCH/tomcat5/tomcat5.changes 2006-04-19 23:37:33.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Apr 19 17:59:44 CEST 2006 - dbornkessel@suse.de + +- removed jdbc as PreReq as it is not provided on all plattforms. + Instead, links and build properties for jdbc are only created + when jdbc is really there (Bug #164836) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomcat5.spec ++++++ --- /var/tmp/diff_new_pack.ZPKMFc/_old 2006-04-20 01:04:15.000000000 +0200 +++ /var/tmp/diff_new_pack.ZPKMFc/_new 2006-04-20 01:04:15.000000000 +0200 @@ -42,7 +42,7 @@ %define workdir %{_localstatedir}/cache/%{name}/base/work Summary: A servlet container Version: 5.0.30 -Release: 18 +Release: 21 License: Other License(s), see package, X11/MIT Group: Productivity/Networking/Web/Frontends URL: http://jakarta.apache.org @@ -89,7 +89,7 @@ # alternatives PreReq: jaas, jndi, jndi-ldap, java-devel # jdbc extension is not available on 64bit platforms -PreReq: jdbc-stdext +#PreReq: jdbc-stdext # non-free stuff PreReq: jta >= 1.0.1-0.a.1, jaf >= 1.0.1, javamail >= 1.3 PreReq: servletapi5 >= 5.0.18 @@ -271,7 +271,6 @@ jta.jar=$(build-classpath jta) jaas.jar=$(build-classpath jaas) jndi.jar=$(build-classpath jndi) -jdbc20ext.jar=$(build-classpath jdbc-stdext) puretls.jar=$(build-classpath puretls) jcert.jar=$(build-classpath jsse/jcert) jnet.jar=$(build-classpath jsse/jnet) @@ -279,6 +278,10 @@ servletapi.build.notrequired=true jspapi.build.notrequired=true EOBP +if build-classpath jdbc-stdext +then + echo jdbc20ext.jar=$(build-classpath jdbc-stdext) >> build.properties +fi # can't use jikes to build tomcat (strange) ant -Dbuild.compiler=modern -Djava.home=%{java_home} build popd @@ -308,12 +311,15 @@ jta.jar=$(build-classpath jta) jaas.jar=$(build-classpath jaas) jndi.jar=$(build-classpath jndi) -jdbc20ext.jar=$(build-classpath jdbc-stdext) puretls.jar=$(build-classpath puretls) jcert.jar=$(build-classpath jsse/jcert) jnet.jar=$(build-classpath jsse/jnet) jsse.jar=$(build-classpath jsse/jsse) EOBP +if build-classpath jdbc-stdext +then + echo jdbc20ext.jar=$(build-classpath jdbc-stdext) >> build.properties +fi ant -Dbuild.compiler=modern -Djava.home=%{java_home} build dist popd @@ -451,8 +457,12 @@ catalina-ant5 2>&1 build-jar-repository %{commondir}/lib ant commons-collections commons-dbcp \ commons-pool commons-logging-api commons-el\ - jaf jdbc-stdext jta javamail jndi jmxri \ + jaf jta javamail jndi jmxri \ jspapi servletapi5 log4j 2>&1 +if ! build-jar-repository %{commondir}/lib jdbc-stdext > /dev/null 2>&1 +then + rm %{commondir}/lib/[jdbc-stdext].jar +fi # compatibility link for eclipse server runtime check for tomcat ln -sf %{commondir}/lib/servletapi5.jar $RPM_BUILD_ROOT/%{commondir}/lib/servlet-api.jar build-jar-repository %{commondir}/endorsed jaxp_parser_impl xml-commons-apis 2>&1 @@ -464,8 +474,12 @@ catalina-ant5 2>&1 build-jar-repository -s -p %{commondir}/lib ant commons-collections commons-dbcp \ commons-pool commons-logging-api commons-el\ - jaf jdbc-stdext jta javamail jndi jmxri \ + jaf jta javamail jndi jmxri \ jspapi servletapi5 log4j 2>&1 +if ! build-jar-repository -s -p %{commondir}/lib jdbc-stdext 2>&1 +then + rm %{commondir}/lib/jdbc-stdext.jar +fi build-jar-repository -s -p %{commondir}/endorsed jaxp_parser_impl xml-commons-apis 2>&1 # suse specific if [ -f /etc/sysconfig/j2ee ] @@ -629,6 +643,10 @@ %{serverdir}/webapps/* %changelog -n tomcat5 +* Wed Apr 19 2006 - dbornkessel@suse.de +- removed jdbc as PreReq as it is not provided on all plattforms. + Instead, links and build properties for jdbc are only created + when jdbc is really there (Bug #164836) * Mon Mar 27 2006 - dbornkessel@suse.de - link /usr/share/tomcat5/common/lib/servletapi5.jar -> /usr/share/tomcat5/common/lib/servlet-api.jar for eclipse server runtime verification script (Bug #160769) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...