[postgresql/f14] Update to PostgreSQL 8.4.10

[Tom Lane]

commit 6aca5aa1f7c729bf8a91ea979358a3abb450cf83
Author: Tom Lane <tgl at redhat.com>
Date:   Mon Dec 5 12:05:00 2011 -0500

    Update to PostgreSQL 8.4.10

 .gitignore                  |    4 ++--
 generate-pdf.sh             |   15 +++++++++------
 postgresql-ac-version.patch |    8 ++++----
 postgresql.spec             |    6 +++++-
 sources                     |    4 ++--
 5 files changed, 22 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2e07d83..c8d0b27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/postgresql-8.4.9.tar.bz2
-/postgresql-8.4.9-US.pdf
+/postgresql-8.4.10.tar.bz2
+/postgresql-8.4.10-US.pdf
diff --git a/generate-pdf.sh b/generate-pdf.sh
index 9158a45..8a8ada5 100755
--- a/generate-pdf.sh
+++ b/generate-pdf.sh
@@ -13,9 +13,10 @@
 # You will need to have the docbook packages installed to run this.
 # Expect it to take about 20 minutes and use about 160MB of disk.
 
-# Extract version from specfile
+set -e
 
-VERSION=`sed -n 's/^Version: //p' postgresql.spec`
+# Pass package version (e.g., 9.1.2) as argument
+VERSION=$1
 
 TARGETFILE=postgresql-$VERSION-US.pdf
 
@@ -23,17 +24,19 @@ echo Building $TARGETFILE ...
 
 # Unpack and configure postgresql
 
-tar xfj postgresql-$VERSION.tar.bz2 || exit 1
+rm -rf postgresql-$VERSION
+
+tar xfj postgresql-$VERSION.tar.bz2
 
-cd postgresql-$VERSION || exit 1
+cd postgresql-$VERSION
 
-./configure >/dev/null || exit 1
+./configure >/dev/null
 
 # Build the PDF docs
 
 cd doc/src/sgml
 
-make postgres-US.pdf >make.log || exit 1
+make postgres-US.pdf >make.log
 
 mv -f postgres-US.pdf ../../../../$TARGETFILE
 
diff --git a/postgresql-ac-version.patch b/postgresql-ac-version.patch
index ebd2704..3f519b8 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.4.9.orig/configure.in postgresql-8.4.9/configure.in
---- postgresql-8.4.9.orig/configure.in	2009-09-03 20:36:50.000000000 -0400
-+++ postgresql-8.4.9/configure.in	2009-09-04 13:03:07.000000000 -0400
+diff -Naur postgresql-8.4.10.orig/configure.in postgresql-8.4.10/configure.in
+--- postgresql-8.4.10.orig/configure.in	2009-09-03 20:36:50.000000000 -0400
++++ postgresql-8.4.10/configure.in	2009-09-04 13:03:07.000000000 -0400
 @@ -19,10 +19,6 @@
  
- AC_INIT([PostgreSQL], [8.4.9], [pgsql-bugs at postgresql.org])
+ AC_INIT([PostgreSQL], [8.4.10], [pgsql-bugs at postgresql.org])
  
 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required.
 -Untested combinations of 'autoconf' and PostgreSQL versions are not
diff --git a/postgresql.spec b/postgresql.spec
index 62b0461..eb8a087 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -52,7 +52,7 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 8.4
-Version: 8.4.9
+Version: 8.4.10
 Release: 1%{?dist}
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
 # recognizes it as an independent license, so we do as well.
@@ -719,6 +719,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Dec  5 2011 Tom Lane <tgl at redhat.com> 8.4.10-1
+- Update to PostgreSQL 8.4.10, for various fixes described at
+  http://www.postgresql.org/docs/8.4/static/release-8-4-10.html
+
 * Mon Sep 26 2011 Tom Lane <tgl at redhat.com> 8.4.9-1
 - Update to PostgreSQL 8.4.9, for various fixes described at
   http://www.postgresql.org/docs/8.4/static/release-8-4-9.html
diff --git a/sources b/sources
index a1de9cf..ea84858 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-d50b1e2bd2b2284ffc3c7009e70b3d08  postgresql-8.4.9.tar.bz2
-d2a945ae45ead2f20bba83f1083280f9  postgresql-8.4.9-US.pdf
+6fd9b76e1d4df479e0b5402c88b1860e  postgresql-8.4.10.tar.bz2
+da22c4372b73c20b3f5d6df0220a3f52  postgresql-8.4.10-US.pdf