[apache-commons-dbcp/f17] Resolves: 796638 Make buildable with Java 7/JDBC 4.1

[Deepak Bhole]

commit 189cf8b1be7ac14174cf7eee311adffd496db89d
Author: Deepak Bhole <dbhole at redhat.com>
Date:   Tue Mar 6 15:53:25 2012 -0500

    Resolves: 796638
    Make buildable with Java 7/JDBC 4.1

 apache-commons-dbcp.spec |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/apache-commons-dbcp.spec b/apache-commons-dbcp.spec
index 09d7e1a..c4ce0a4 100644
--- a/apache-commons-dbcp.spec
+++ b/apache-commons-dbcp.spec
@@ -3,7 +3,7 @@
 
 Name:             apache-%{short_name}
 Version:          1.4
-Release:          8%{?dist}
+Release:          9%{?dist}
 Summary:          Apache Commons DataBase Pooling Package
 Group:            Development/Libraries
 License:          ASL 2.0
@@ -13,9 +13,10 @@ Source0:          http://www.apache.org/dist/commons/%{base_name}/source/%{short
 # Depmap needed to remove tomcat* deps (needed only for testing)
 # and fix geronimo transaction
 Source1:          %{short_name}.depmap
+Patch0:           jdbc41.patch
 BuildArch:        noarch
 
-BuildRequires:    java-devel >= 1:1.6.0
+BuildRequires:    java-devel
 BuildRequires:    jpackage-utils
 BuildRequires:    apache-commons-parent
 BuildRequires:    apache-commons-pool
@@ -24,7 +25,7 @@ BuildRequires:    jta
 BuildRequires:    maven-plugin-cobertura
 BuildRequires:    maven
 
-Requires:         java >= 1:1.6.0
+Requires:         java
 Requires:         jpackage-utils
 Requires:         apache-commons-pool
 
@@ -61,6 +62,8 @@ This package contains the API documentation for %{name}.
 %setup -q -n %{short_name}-%{version}-src
 iconv -f iso8859-1 -t utf-8 RELEASE-NOTES.txt > RELEASE-NOTES.txt.conv && mv -f RELEASE-NOTES.txt.conv RELEASE-NOTES.txt
 
+%patch0
+
 %build
 # Skip tests, tomcat:naming-java and tomcat:naming-common not available
 mvn-rpmbuild \
@@ -101,6 +104,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Feb 23 2012 Pavel Tisnovsky <ptisnovs at redhat.com> - 1.4-9
+- Make this package independent of OpenJDK6 (it's buildable on OpenJDK7)
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild