Update to build 8.2-506
This commit is contained in:
parent
53609cd69e
commit
a6ef682b38
@ -1 +1 @@
|
|||||||
postgresql-jdbc-8.2-505.src.tar.gz
|
postgresql-jdbc-8.2-506.src.tar.gz
|
||||||
|
@ -1,26 +0,0 @@
|
|||||||
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" />
|
|
@ -33,11 +33,11 @@
|
|||||||
%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
|
%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
|
||||||
|
|
||||||
%define section devel
|
%define section devel
|
||||||
%define upstreamver 8.2-505
|
%define upstreamver 8.2-506
|
||||||
|
|
||||||
Summary: JDBC driver for PostgreSQL
|
Summary: JDBC driver for PostgreSQL
|
||||||
Name: postgresql-jdbc
|
Name: postgresql-jdbc
|
||||||
Version: 8.2.505
|
Version: 8.2.506
|
||||||
Release: 1jpp%{?dist}
|
Release: 1jpp%{?dist}
|
||||||
Epoch: 0
|
Epoch: 0
|
||||||
License: BSD
|
License: BSD
|
||||||
@ -45,7 +45,6 @@ Group: Applications/Databases
|
|||||||
URL: http://jdbc.postgresql.org/
|
URL: http://jdbc.postgresql.org/
|
||||||
|
|
||||||
Source0: http://jdbc.postgresql.org/download/%{name}-%{upstreamver}.src.tar.gz
|
Source0: http://jdbc.postgresql.org/download/%{name}-%{upstreamver}.src.tar.gz
|
||||||
Patch1: postgresql-jdbc-version.patch
|
|
||||||
|
|
||||||
%if ! %{gcj_support}
|
%if ! %{gcj_support}
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
@ -60,7 +59,7 @@ BuildRequires: gcc-java
|
|||||||
Requires(post): /usr/bin/rebuild-gcj-db
|
Requires(post): /usr/bin/rebuild-gcj-db
|
||||||
Requires(postun): /usr/bin/rebuild-gcj-db
|
Requires(postun): /usr/bin/rebuild-gcj-db
|
||||||
%endif
|
%endif
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||||
|
|
||||||
Obsoletes: rh-postgresql-jdbc
|
Obsoletes: rh-postgresql-jdbc
|
||||||
|
|
||||||
@ -78,8 +77,6 @@ rmdir %{name}-%{upstreamver}.src
|
|||||||
# remove any binary libs
|
# remove any binary libs
|
||||||
find -name "*.jar" -or -name "*.class" | xargs rm -f
|
find -name "*.jar" -or -name "*.class" | xargs rm -f
|
||||||
|
|
||||||
%patch1 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export OPT_JAR_LIST="ant/ant-junit junit"
|
export OPT_JAR_LIST="ant/ant-junit junit"
|
||||||
export CLASSPATH=
|
export CLASSPATH=
|
||||||
@ -131,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Aug 12 2007 Tom Lane <tgl@redhat.com> 8.2.506-1jpp
|
||||||
|
- Update to build 8.2-506
|
||||||
|
|
||||||
* Tue Apr 24 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
|
- Update to build 8.2-505
|
||||||
- Work around 1.4 vs 1.5 versioning inconsistency
|
- Work around 1.4 vs 1.5 versioning inconsistency
|
||||||
|
Loading…
Reference in New Issue
Block a user