From a15ec211c95d7f72e508867d9af6290da5995d14 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@fedoraproject.org>
Date: Wed, 14 Dec 2005 22:33:00 +0000
Subject: Update to PostgreSQL 8.1.1; fix multilib issues for devel package.

---
 .cvsignore      |  2 +-
 pg_config.h     | 30 ++++++++++++++++++++++++++++++
 postgresql.spec | 26 +++++++++++++++++++-------
 sources         |  2 +-
 4 files changed, 51 insertions(+), 9 deletions(-)
 create mode 100644 pg_config.h

diff --git a/.cvsignore b/.cvsignore
index 45355c1..91041d8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,4 @@
-postgresql-8.1.0.tar.bz2
+postgresql-8.1.1.tar.bz2
 PyGreSQL-3.7.tgz
 pgtcl1.5.2.tar.gz
 pgtcldocs-20041108.zip
diff --git a/pg_config.h b/pg_config.h
new file mode 100644
index 0000000..8e93875
--- /dev/null
+++ b/pg_config.h
@@ -0,0 +1,30 @@
+/*
+ * Kluge to support multilib installation of both 32- and 64-bit RPMS:
+ * we need to arrange that header files that appear in both RPMs are
+ * identical.  Hence, this file is architecture-independent and calls
+ * in an arch-dependent file that will appear in just one RPM.
+ *
+ * Note: this may well fail if user tries to use gcc's -I- option.
+ * But that option is deprecated anyway.
+ */
+#ifdef __i386__
+#include "pg_config_i386.h"
+#endif
+#ifdef __x86_64__
+#include "pg_config_x86_64.h"
+#endif
+#ifdef __ia64__
+#include "pg_config_ia64.h"
+#endif
+#ifdef __ppc__
+#include "pg_config_ppc.h"
+#endif
+#ifdef __ppc64__
+#include "pg_config_ppc64.h"
+#endif
+#ifdef __s390__
+#include "pg_config_s390.h"
+#endif
+#ifdef __s390x__
+#include "pg_config_s390x.h"
+#endif
diff --git a/postgresql.spec b/postgresql.spec
index f7caada..d245e11 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -48,17 +48,17 @@
 # The base package, the lib package, the devel package, and the server package always get built.
 
 #build7x, build8, and build9 similar
-%{?build8:%define build89 1}
-%{?build9:%define build89 1}
 %{?build7x:%define tcldevel 0}
-%{?build8:%define tcldevel 0}
 %{?build7x:%define aconfver autoconf-2.53}
-
-%{!?aconfver:%define aconfver autoconf}
+%{?build8:%define build89 1}
+%{?build8:%define tcldevel 0}
+%{?build9:%define build89 1}
 
 %define beta 0
 %{?beta:%define __os_install_post /usr/lib/rpm/brp-compress}
 
+%{!?aconfver:%define aconfver autoconf}
+
 %{!?tcldevel:%define tcldevel 1}
 %{!?jdbc:%define jdbc 1}
 %{!?test:%define test 1}
@@ -81,8 +81,8 @@
 
 Summary: PostgreSQL client programs and libraries.
 Name: postgresql
-Version: 8.1.0
-Release: 4.1
+Version: 8.1.1
+Release: 1
 License: BSD
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -90,6 +90,7 @@ Url: http://www.postgresql.org/
 Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
 Source3: postgresql.init
 Source4: Makefile.regress
+Source5: pg_config.h
 Source6: README.rpm-dist
 Source8: http://jdbc.postgresql.org/download/postgresql-8.1-404.jdbc2.jar
 Source9: http://jdbc.postgresql.org/download/postgresql-8.1-404.jdbc2ee.jar
@@ -466,6 +467,12 @@ make -C contrib DESTDIR=$RPM_BUILD_ROOT install
 make -C contrib/xml2 DESTDIR=$RPM_BUILD_ROOT install
 %endif
 
+# multilib header hack; note pg_config.h is installed in two places!
+mv $RPM_BUILD_ROOT/usr/include/pg_config.h $RPM_BUILD_ROOT/usr/include/pg_config_`uname -m`.h
+install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/
+mv $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config.h $RPM_BUILD_ROOT/usr/include/pgsql/server/pg_config_`uname -m`.h
+install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/pgsql/server/
+
 install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
 cp src/tutorial/* $RPM_BUILD_ROOT%{_libdir}/pgsql/tutorial
 
@@ -809,6 +816,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Dec 14 2005 Tom Lane <tgl@redhat.com> 8.1.1-1
+- Update to PostgreSQL 8.1.1
+- Make pg_config.h architecture-independent for multilib installs;
+  put the original pg_config.h into pg_config_$ARCH.h
+
 * Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
 - rebuilt
 
diff --git a/sources b/sources
index bd3b791..d66a8e9 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-5e1f1a7c5f62170b56a3bf2512fdec2d  postgresql-8.1.0.tar.bz2
+d22d7bd1d5e5f9aa89d574ff66e2c8bb  postgresql-8.1.1.tar.bz2
 9fa4c2fc1dd0b3b93a3381c048443e16  PyGreSQL-3.7.tgz
 d19dfdcb54c334495d32456a043e0232  pgtcl1.5.2.tar.gz
 3d504b46231914d61fd49175f67e8715  pgtcldocs-20041108.zip
-- 
cgit