From 31a12b396608e98d1e5f440711bb04667ca446fe Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@fedoraproject.org>
Date: Tue, 18 Aug 2009 04:00:50 +0000
Subject: [PATCH] Update to build 8.4-701

---
 .cvsignore                         |  2 +-
 postgresql-jdbc-bogus-import.patch | 14 ++++++++++++++
 postgresql-jdbc-version.patch      | 17 -----------------
 postgresql-jdbc.spec               | 12 +++++++-----
 sources                            |  2 +-
 5 files changed, 23 insertions(+), 24 deletions(-)
 create mode 100644 postgresql-jdbc-bogus-import.patch
 delete mode 100644 postgresql-jdbc-version.patch

diff --git a/.cvsignore b/.cvsignore
index 1b62d8e..75ad77a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-postgresql-jdbc-8.3-603.src.tar.gz
+postgresql-jdbc-8.4-701.src.tar.gz
diff --git a/postgresql-jdbc-bogus-import.patch b/postgresql-jdbc-bogus-import.patch
new file mode 100644
index 0000000..e3d3674
--- /dev/null
+++ b/postgresql-jdbc-bogus-import.patch
@@ -0,0 +1,14 @@
+Remove a debugging leftover.
+
+
+diff -Naur postgresql-jdbc-8.4-701.src.orig/org/postgresql/gss/MakeGSS.java postgresql-jdbc-8.4-701.src/org/postgresql/gss/MakeGSS.java
+--- postgresql-jdbc-8.4-701.src.orig/org/postgresql/gss/MakeGSS.java	2008-11-29 02:43:47.000000000 -0500
++++ postgresql-jdbc-8.4-701.src/org/postgresql/gss/MakeGSS.java	2009-08-17 23:50:41.000000000 -0400
+@@ -18,7 +18,6 @@
+ import java.io.IOException;
+ import java.sql.SQLException;
+ 
+-import com.sun.security.auth.callback.TextCallbackHandler;
+ import org.postgresql.core.PGStream;
+ import org.postgresql.core.Logger;
+ import org.postgresql.util.*;
diff --git a/postgresql-jdbc-version.patch b/postgresql-jdbc-version.patch
deleted file mode 100644
index db703c7..0000000
--- a/postgresql-jdbc-version.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Needed to build on Fedora 8 or later ...
-
-
-diff -Naur postgresql-jdbc-8.3-603.src.orig/build.xml postgresql-jdbc-8.3-603.src/build.xml
---- postgresql-jdbc-8.3-603.src.orig/build.xml	2008-01-08 01:56:26.000000000 -0500
-+++ postgresql-jdbc-8.3-603.src/build.xml	2008-02-12 11:57:16.000000000 -0500
-@@ -45,7 +45,10 @@
- 	<equals arg1="${java.specification.version}" arg2="1.5"/>
-     </condition>
-     <condition property="jdbc4">
-+      <or>
-         <equals arg1="${java.specification.version}" arg2="1.6"/>
-+        <equals arg1="${java.specification.version}" arg2="1.7"/>
-+      </or>
-     </condition>
-     <condition property="jdbc3any">
-       <or>
diff --git a/postgresql-jdbc.spec b/postgresql-jdbc.spec
index 236484c..8628691 100644
--- a/postgresql-jdbc.spec
+++ b/postgresql-jdbc.spec
@@ -33,19 +33,18 @@
 %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 upstreamver	8.3-603
+%define upstreamver	8.4-701
 
 Summary:	JDBC driver for PostgreSQL
 Name:		postgresql-jdbc
-Version:	8.3.603
-Release:	4%{?dist}
-Epoch:		0
+Version:	8.4.701
+Release:	1%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://jdbc.postgresql.org/
 
 Source0:	http://jdbc.postgresql.org/download/%{name}-%{upstreamver}.src.tar.gz
-Patch1:         postgresql-jdbc-version.patch
+Patch1:		postgresql-jdbc-bogus-import.patch
 
 %if ! %{gcj_support}
 BuildArch:	noarch
@@ -139,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Aug 18 2009 Tom Lane <tgl@redhat.com> 8.4.701-1
+- Update to build 8.4-701
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:8.3.603-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 0932f8a..05e4063 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6e130d3dc307d27757252ff28ce9a9f2  postgresql-jdbc-8.3-603.src.tar.gz
+9e91abdd1139e66d9e8e9ae6f9428e2f  postgresql-jdbc-8.4-701.src.tar.gz