From 5561da7f66ab808dd6dc43fb20df374e57ea4dd5 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 29 Dec 2010 16:32:33 -0500 Subject: [PATCH] Update to build 9.0-801 --- .gitignore | 2 +- postgresql-jdbc-bogus-import.patch | 14 -------------- postgresql-jdbc.spec | 12 ++++++------ sources | 2 +- 4 files changed, 8 insertions(+), 22 deletions(-) delete mode 100644 postgresql-jdbc-bogus-import.patch diff --git a/.gitignore b/.gitignore index 75ad77a..995cb4f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -postgresql-jdbc-8.4-701.src.tar.gz +/postgresql-jdbc-9.0-801.src.tar.gz diff --git a/postgresql-jdbc-bogus-import.patch b/postgresql-jdbc-bogus-import.patch deleted file mode 100644 index e3d3674..0000000 --- a/postgresql-jdbc-bogus-import.patch +++ /dev/null @@ -1,14 +0,0 @@ -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.spec b/postgresql-jdbc.spec index 28a47fc..bc53dab 100644 --- a/postgresql-jdbc.spec +++ b/postgresql-jdbc.spec @@ -33,12 +33,12 @@ %global gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}} %global section devel -%global upstreamver 8.4-701 +%global upstreamver 9.0-801 Summary: JDBC driver for PostgreSQL Name: postgresql-jdbc -Version: 8.4.701 -Release: 4%{?dist} +Version: 9.0.801 +Release: 1%{?dist} # ASL 2.0 applies only to postgresql-jdbc.pom file, the rest is BSD License: BSD and ASL 2.0 Group: Applications/Databases @@ -47,7 +47,6 @@ URL: http://jdbc.postgresql.org/ Source0: http://jdbc.postgresql.org/download/%{name}-%{upstreamver}.src.tar.gz # originally http://repo2.maven.org/maven2/postgresql/postgresql/8.4-701.jdbc4/postgresql-8.4-701.jdbc4.pom: Source1: postgresql-jdbc.pom -Patch1: postgresql-jdbc-bogus-import.patch %if ! %{gcj_support} BuildArch: noarch @@ -84,8 +83,6 @@ 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= @@ -157,6 +154,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/maven2/poms/JPP-%{name}.pom %changelog +* Wed Dec 29 2010 Tom Lane 9.0.801-1 +- Update to build 9.0-801 + * Mon May 31 2010 Tom Lane 8.4.701-4 - Update gcj_support sections to meet Packaging/GCJGuidelines; fixes FTBFS in F-14 rawhide diff --git a/sources b/sources index 05e4063..38fcbf4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9e91abdd1139e66d9e8e9ae6f9428e2f postgresql-jdbc-8.4-701.src.tar.gz +32188109251f8da2766da77b174232bc postgresql-jdbc-9.0-801.src.tar.gz