[javasqlite] Updated spec file to apply JDBC 4.1/Java 7 patch

[Deepak Bhole]

commit c5a165ae0c477b6cb1cb70d58afd4a7f2efa73d9
Author: Deepak Bhole <dbhole at redhat.com>
Date:   Wed Jan 25 10:29:19 2012 -0500

    Updated spec file to apply JDBC 4.1/Java 7 patch

 javasqlite.spec |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/javasqlite.spec b/javasqlite.spec
index 222b5e1..8d85c3e 100644
--- a/javasqlite.spec
+++ b/javasqlite.spec
@@ -8,7 +8,7 @@
 
 Name:           javasqlite
 Version:        20110827
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        SQLite Java Wrapper/JDBC Driver
 
 Group:          Development/Libraries
@@ -17,6 +17,7 @@ URL:            http://www.ch-werner.de/javasqlite/
 Source0:        http://www.ch-werner.de/javasqlite/%{name}-%{version}.tar.gz
 # Fedora specific, no need to send upstream.
 Patch0:         %{name}-20090430-jnipath.patch
+Patch1:         %{name}-javasqlite-jdbc-4.1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # >= 3.4 for zeroblob stuff in %%check's test3
@@ -24,10 +25,10 @@ BuildRequires:  sqlite-devel >= 3.4
 %if 0%{?only15}
 BuildRequires:  java-1.5.0-javadoc
 %else
-BuildRequires:  java-1.6.0-devel
-BuildRequires:  java-1.6.0-javadoc
+BuildRequires:  java-devel >= 1.6
+BuildRequires:  java-javadoc >= 1.6
 %endif
-BuildRequires:  java-1.5.0-devel
+BuildRequires:  java-devel >= 1.6
 Requires:       jre
 
 %description
@@ -47,6 +48,7 @@ API documentation for %{name}.
 
 %prep
 %setup -q
+%patch1 -p1
 sed -e 's|@JNIPATH@|%{_libdir}/%{name}|' %{PATCH0} | patch -p1 --fuzz=0
 sed -i -e 's/\r//g' doc/ajhowto.txt
 f=ChangeLog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
@@ -77,8 +79,8 @@ make sqlite.jar JAVAC_FLAGS="-source 5" # Java build not parallel clean
 %if 0%{?only15}
 make %{?_smp_mflags}
 %else
-export PATH="%{_jvmdir}/java-1.6.0/bin:$origpath" # bug 460761 (to be sure)
-%configure $common_flags --with-jdk=%{_jvmdir}/java-1.6.0
+export PATH="%{_jvmdir}/java/bin:$origpath" # bug 460761 (to be sure)
+%configure $common_flags --with-jdk=%{_jvmdir}/java
 make # Java build not parallel clean
 
 # Add JDBC 3 classes
@@ -124,6 +126,10 @@ done
 
 
 %changelog
+* Wed Jan 25 2012 Deepak Bhole <dbhole at redhat.com> - 20110827-3
+- Removed specific Java 6 requirement
+- Added patch to build with JDBC 4.1/Java 7
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20110827-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild