From ef0957ba0a0b4226da155c632724c0e3183b6d55 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@fedoraproject.org>
Date: Sun, 2 Nov 2008 18:23:29 +0000
Subject: [PATCH] Update to PostgreSQL 8.3.5

---
 .cvsignore                  | 4 ++--
 postgresql-ac-version.patch | 8 ++++----
 postgresql.init             | 4 +++-
 postgresql.spec             | 8 ++++++--
 sources                     | 4 ++--
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index b1dfd87..b58faa9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,5 @@
-postgresql-8.3.4.tar.bz2
+postgresql-8.3.5.tar.bz2
 PyGreSQL-3.8.1.tgz
 pgtcl1.6.2.tar.gz
 pgtcldocs-20070115.zip
-postgresql-8.3.4-US.pdf
+postgresql-8.3.5-US.pdf
diff --git a/postgresql-ac-version.patch b/postgresql-ac-version.patch
index 8626036..afe3e31 100644
--- a/postgresql-ac-version.patch
+++ b/postgresql-ac-version.patch
@@ -4,12 +4,12 @@ for PostgreSQL, but it's not very tenable in the Fedora/RHEL world.
 Dike out the check.
 
 
-diff -Naur postgresql-8.3.4.orig/configure.in postgresql-8.3.4/configure.in
---- postgresql-8.3.4.orig/configure.in	2008-09-18 23:04:12.000000000 -0400
-+++ postgresql-8.3.4/configure.in	2008-09-25 10:26:10.000000000 -0400
+diff -Naur postgresql-8.3.5.orig/configure.in postgresql-8.3.5/configure.in
+--- postgresql-8.3.5.orig/configure.in	2008-09-18 23:04:12.000000000 -0400
++++ postgresql-8.3.5/configure.in	2008-09-25 10:26:10.000000000 -0400
 @@ -19,10 +19,6 @@
  
- AC_INIT([PostgreSQL], [8.3.4], [pgsql-bugs@postgresql.org])
+ AC_INIT([PostgreSQL], [8.3.5], [pgsql-bugs@postgresql.org])
  
 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required.
 -Untested combinations of 'autoconf' and PostgreSQL versions are not
diff --git a/postgresql.init b/postgresql.init
index 37d6011..adb395a 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -230,8 +230,9 @@ reload(){
 initdb(){
     if [ -f "$PGDATA/PG_VERSION" ]
     then
-	echo "Data directory is not empty!"
+	echo -n "Data directory is not empty!"
 	echo_failure
+	echo
 	script_result=1
     else
 	echo -n $"Initializing database: "
@@ -257,6 +258,7 @@ initdb(){
 	    echo_failure
 	    script_result=1
 	fi
+	echo
     fi
 }
 
diff --git a/postgresql.spec b/postgresql.spec
index 745b4e8..c91680d 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -82,7 +82,7 @@
 
 Summary: PostgreSQL client programs and libraries
 Name: postgresql
-Version: 8.3.4
+Version: 8.3.5
 Release: 1%{?dist}
 License: BSD
 Group: Applications/Databases
@@ -97,7 +97,7 @@ Source7: ecpg_config.h
 Source14: postgresql.pam
 Source15: postgresql-bashprofile
 Source16: filter-requires-perl-Pg.sh
-Source17: http://www.postgresql.org/docs/manuals/postgresql-8.3.4-US.pdf
+Source17: http://www.postgresql.org/docs/manuals/postgresql-8.3.5-US.pdf
 Source18: ftp://ftp.pygresql.org/pub/distrib/PyGreSQL-3.8.1.tgz
 Source19: http://pgfoundry.org/projects/pgtclng/pgtcl1.6.2.tar.gz
 Source20: http://pgfoundry.org/projects/pgtclng/pgtcldocs-20070115.zip
@@ -859,6 +859,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Nov  2 2008 Tom Lane <tgl@redhat.com> 8.3.5-1
+- Update to PostgreSQL 8.3.5.
+- Improve display from init script's initdb action, per Michael Schwendt
+
 * Thu Sep 25 2008 Tom Lane <tgl@redhat.com> 8.3.4-1
 - Update to PostgreSQL 8.3.4.
 
diff --git a/sources b/sources
index 998b695..c7a1b2e 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-c339b9d3c0c4add64c7a76640fc93744  postgresql-8.3.4.tar.bz2
+3bc028774d7a79e926be0c6a9c7ca209  postgresql-8.3.5.tar.bz2
 5575979dac93c9c5795d7693a8f91c86  PyGreSQL-3.8.1.tgz
 abf26e3cd7f8229f468045ed1fb7e748  pgtcl1.6.2.tar.gz
 8ce98e93b238c3329d0fe43810442c44  pgtcldocs-20070115.zip
-cbe2df6b07791aa5050b065c1ae2a132  postgresql-8.3.4-US.pdf
+45042f646d2d7979acd9f3d03572c705  postgresql-8.3.5-US.pdf