From 53609cd69e454e4fd43ce6e28c232b27bef51b54 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@fedoraproject.org>
Date: Tue, 24 Apr 2007 17:58:19 +0000
Subject: [PATCH] Work around 1.4 vs 1.5 versioning inconsistency

---
 postgresql-jdbc-version.patch | 26 ++++++++++++++++++++++++++
 postgresql-jdbc.spec          |  6 +++++-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 postgresql-jdbc-version.patch

diff --git a/postgresql-jdbc-version.patch b/postgresql-jdbc-version.patch
new file mode 100644
index 0000000..1b726dc
--- /dev/null
+++ b/postgresql-jdbc-version.patch
@@ -0,0 +1,26 @@
+Workaround for problem that ant's java.specification.version reports 1.5
+but that's not the default source for <javac> as of F7.  This will probably
+be fixed by a cleaner upstream change, but for now, just force it.
+
+
+diff -Naur postgresql-jdbc-8.2-505.src.orig/build.xml postgresql-jdbc-8.2-505.src/build.xml
+--- postgresql-jdbc-8.2-505.src.orig/build.xml	2006-11-28 23:00:15.000000000 -0500
++++ postgresql-jdbc-8.2-505.src/build.xml	2007-04-24 13:31:29.000000000 -0400
+@@ -112,7 +112,7 @@
+     <available classname="org.postgresql.Driver" property="old.driver.present" />
+     <fail message="Old driver was detected on classpath or in jre/lib/ext, please remove and try again." if="old.driver.present" />
+ 
+-    <javac classpath="${srcdir}" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}">
++    <javac classpath="${srcdir}" srcdir="${srcdir}" destdir="${builddir}" debug="${debug}" source="1.5">
+       <!-- This is the core of the driver.  It is common for all versions. -->
+        <include name="${package}/*.java" />
+        <include name="${package}/core/**" />
+@@ -386,7 +386,7 @@
+   <target name="testjar" depends="jar">
+     <fail message="JUnit could not be found in your classpath.  You must download and install it from http://junit.org to build and run the test suite." unless="junit" />
+     <mkdir dir="${builddir}/tests"/>
+-    <javac srcdir="${srcdir}" destdir="${builddir}/tests" debug="${debug}">
++    <javac srcdir="${srcdir}" destdir="${builddir}/tests" debug="${debug}" source="1.5">
+       <include name="${package}/test/**" />
+ 
+       <exclude name="${package}/test/jdbc2/optional/**" unless="jdbc2optionaltests" />
diff --git a/postgresql-jdbc.spec b/postgresql-jdbc.spec
index da65401..c0d2c97 100644
--- a/postgresql-jdbc.spec
+++ b/postgresql-jdbc.spec
@@ -45,6 +45,7 @@ Group:		Applications/Databases
 URL:		http://jdbc.postgresql.org/
 
 Source0:	http://jdbc.postgresql.org/download/%{name}-%{upstreamver}.src.tar.gz
+Patch1:		postgresql-jdbc-version.patch
 
 %if ! %{gcj_support}
 BuildArch:	noarch
@@ -77,6 +78,8 @@ rmdir %{name}-%{upstreamver}.src
 # remove any binary libs
 find -name "*.jar" -or -name "*.class" | xargs rm -f
 
+%patch1 -p1
+
 %build
 export OPT_JAR_LIST="ant/ant-junit junit"
 export CLASSPATH=
@@ -128,8 +131,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Mon Apr 23 2007 Tom Lane <tgl@redhat.com> 8.2.505-1jpp
+* Tue Apr 24 2007 Tom Lane <tgl@redhat.com> 8.2.505-1jpp
 - Update to build 8.2-505
+- Work around 1.4 vs 1.5 versioning inconsistency
 
 * Fri Dec 15 2006 Tom Lane <tgl@redhat.com> 8.2.504-1jpp
 - Update to build 8.2-504