From b7e10ec5454db62e0f048f54a981f2ccf382c1cf Mon Sep 17 00:00:00 2001
From: Ivan Afonichev <ivan.afonichev@gmail.com>
Date: May 11 2013 15:51:28 +0000
Subject: Merge branch 'f18' of ssh://pkgs.fedoraproject.org/tomcat into f19


Conflicts:
	tomcat.spec

---

diff --git a/sources b/sources
index 4cdfe58..20aa8e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6ab7fcd20def4835f33d6c0b2f19c5ef  apache-tomcat-7.0.37-src.tar.gz
+158df72e6c046fa5d46a691a7c0805e6  apache-tomcat-7.0.40-src.tar.gz
diff --git a/tomcat.spec b/tomcat.spec
index 0b2341c..4f0e810 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -31,7 +31,7 @@
 %global jspspec 2.2
 %global major_version 7
 %global minor_version 0
-%global micro_version 37
+%global micro_version 40
 %global packdname apache-tomcat-%{version}-src
 %global servletspec 3.0
 %global elspec 2.2
@@ -409,6 +409,7 @@ pushd ${RPM_BUILD_ROOT}%{libdir}
     %{__ln_s} ../%{name}-el-%{elspec}-api.jar .
     %{__ln_s} $(build-classpath apache-commons-collections) commons-collections.jar
     %{__ln_s} $(build-classpath apache-commons-dbcp) commons-dbcp.jar
+    %{__ln_s} $(build-classpath apache-commons-pool) commons-pool.jar
     %{__ln_s} $(build-classpath log4j) log4j.jar
     %{__ln_s} $(build-classpath ecj) jasper-jdt.jar
 
@@ -676,6 +677,13 @@ fi
 %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service
 
 %changelog
+* Sat May 11 2013 Ivan Afonichev <ivan.afonichev@gmail.com> 0:7.0.40-1
+- Updated to 7.0.40
+- Resolves: rhbz 956569 added missing commons-pool link
+
+* Wed Feb 20 2013 Ivan Afonichev <ivan.afonichev@gmail.com> 0:7.0.39-1
+- Updated to 7.0.39
+
 * Mon Mar  4 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:7.0.37-2
 - Add depmaps for org.eclipse.jetty.orbit
 - Resolves: rhbz#917626