summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Lane <tgl@fedoraproject.org>2009-10-16 03:47:52 +0000
committerTom Lane <tgl@fedoraproject.org>2009-10-16 03:47:52 +0000
commitb1315b865a0a8c4d2eeed3114e9fba616a02be72 (patch)
tree0cf3b389152267342e77a0ebde41ff6459e765b3
parent8387bb8f87d49463413e237acef387a0e5ad0a52 (diff)
downloadpostgresql-setup-b1315b865a0a8c4d2eeed3114e9fba616a02be72.tar.gz
postgresql-setup-b1315b865a0a8c4d2eeed3114e9fba616a02be72.tar.xz
postgresql-setup-b1315b865a0a8c4d2eeed3114e9fba616a02be72.zip
add sparc/sparc64 to multilib header supportpostgresql-8_4_1-4_fc13
-rw-r--r--ecpg_config.h4
-rw-r--r--pg_config.h4
-rwxr-xr-xpostgresql.spec10
3 files changed, 15 insertions, 3 deletions
diff --git a/ecpg_config.h b/ecpg_config.h
index 5b0bdd2..6fecfcb 100644
--- a/ecpg_config.h
+++ b/ecpg_config.h
@@ -22,4 +22,8 @@
#include "ecpg_config_s390x.h"
#elif defined(__s390__)
#include "ecpg_config_s390.h"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "ecpg_config_sparc64.h"
+#elif defined(__sparc__)
+#include "ecpg_config_sparc.h"
#endif
diff --git a/pg_config.h b/pg_config.h
index f00828a..97ef2ba 100644
--- a/pg_config.h
+++ b/pg_config.h
@@ -22,4 +22,8 @@
#include "pg_config_s390x.h"
#elif defined(__s390__)
#include "pg_config_s390.h"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "pg_config_sparc64.h"
+#elif defined(__sparc__)
+#include "pg_config_sparc.h"
#endif
diff --git a/postgresql.spec b/postgresql.spec
index 11780b4..d7cb7a8 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -60,8 +60,9 @@ Summary: PostgreSQL client programs and libraries
Name: postgresql
%define majorversion 8.4
Version: 8.4.1
-Release: 3%{?dist}
-# PG considers their license to be simplified BSD, but it's more nearly MIT
+Release: 4%{?dist}
+# PostgreSQL calls their license simplified BSD, but the requirements are
+# more similar to other MIT licenses.
License: MIT
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -478,7 +479,7 @@ make -C contrib DESTDIR=$RPM_BUILD_ROOT install
# multilib header hack; note pg_config.h is installed in two places!
# we only apply this to known Red Hat multilib arches, per bug #177564
case `uname -i` in
- i386 | x86_64 | ppc | ppc64 | s390 | s390x)
+ i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparc64 )
mv $RPM_BUILD_ROOT/usr/include/pg_config.h $RPM_BUILD_ROOT/usr/include/pg_config_`uname -i`.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 -i`.h
@@ -854,6 +855,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Thu Oct 15 2009 Tom Lane <tgl@redhat.com> 8.4.1-4
+- add sparc/sparc64 to multilib header support
+
* Mon Sep 21 2009 Tom Lane <tgl@redhat.com> 8.4.1-3
- Ensure pgstartup.log gets the right ownership/permissions during initdb
Resolves: #498959