rpms/postgresql-jdbc
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Work around 1.4 vs 1.5 versioning inconsistency

Browse Source
This commit is contained in:
Tom Lane 2007-04-24 17:58:19 +00:00
parent dac81ae800
commit 53609cd69e
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
postgresql-jdbc-version.patch Normal file
View File

@ -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" />

6
postgresql-jdbc.spec
View File

@ -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