From 148ca89386ca245df7a2e267757443b27e9b17e4b519f90d0c8f3f6050dc2e1e Mon Sep 17 00:00:00 2001
From: Michal Vyskocil <michal.vyskocil@gmail.com>
Date: Thu, 5 Sep 2013 14:01:11 +0000
Subject: [PATCH] - drop a dependency on unecessary -tomcat5 packages

OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=34
---
 tomcat.changes |  7 +++++++
 tomcat.spec    | 12 +++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/tomcat.changes b/tomcat.changes
index a36c702..ba91d6e 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Sep  5 13:59:28 UTC 2013 - mvyskocil@suse.com
+
+- drop a dependency on unecessary -tomcat5 packages 
+- use commons-dbcp.jar for build
+- add missing commons-pool.jar to libdir
+
 -------------------------------------------------------------------
 Fri Aug  9 09:18:44 UTC 2013 - mvyskocil@suse.com
 
diff --git a/tomcat.spec b/tomcat.spec
index 59156ed..2b69409 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -217,9 +217,9 @@ Requires:       %{name}-el-%{elspec}-api = %{version}-%{release}
 Requires:       %{name}-jsp-%{jspspec}-api = %{version}-%{release}
 Requires:       %{name}-servlet-%{servletspec}-api = %{version}-%{release}
 Requires(post): ecj >= 4.2.1
-Requires(post): jakarta-commons-collections-tomcat5
-Requires(post): jakarta-commons-dbcp-tomcat5
-Requires(post): jakarta-commons-pool-tomcat5
+#Requires(post): jakarta-commons-collections-tomcat5
+#$Requires(post): jakarta-commons-dbcp-tomcat5
+#Requires(post): jakarta-commons-pool-tomcat5
 Requires(preun):%{__rm}
 
 %description lib
@@ -289,7 +289,7 @@ touch HACKDIR/build.xml
     -Dcommons-daemon.native.src.tgz="HACK" \
     -Djasper-jdt.jar="$(build-classpath ecj)" \
     -Djdt.jar="$(build-classpath ecj)" \
-    -Dtomcat-dbcp.jar="HACK" \
+    -Dtomcat-dbcp.jar="$(build-classpath commons-dbcp)" \
     -Dtomcat-native.tar.gz="HACK" \
     -Dtomcat-native.home="." \
     -Dcommons-daemon.native.win.mgr.exe="HACK" \
@@ -305,7 +305,8 @@ touch HACKDIR/build.xml
 
 # remove some jars that we'll replace with symlinks later
 %{__rm} output/build/bin/commons-daemon.jar \
-        output/build/lib/ecj.jar
+        output/build/lib/ecj.jar \
+        output/build/lib/commons-dbcp.jar
 # remove the cruft we created
 %{__rm} output/build/bin/tomcat-native.tar.gz
 
@@ -448,6 +449,7 @@ pushd %{buildroot}%{libdir}
     %{__ln_s} ../%{name}-el-%{elspec}-api.jar .
     %{__ln_s} $(build-classpath commons-collections) commons-collections.jar
     %{__ln_s} $(build-classpath commons-dbcp) commons-dbcp.jar
+    %{__ln_s} $(build-classpath commons-pool) commons-pool.jar
     %{__ln_s} $(build-classpath log4j) log4j.jar
     %{__ln_s} $(build-classpath ecj) jasper-jdt.jar