rpms/postgresql/devel ecpg_config.h, NONE, 1.1 postgresql.spec, 1.82, 1.83
Tom Lane (tgl)
fedora-extras-commits at redhat.com
Tue Sep 4 17:27:10 UTC 2007
Author: tgl
Update of /cvs/pkgs/rpms/postgresql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14948
Modified Files:
postgresql.spec
Added Files:
ecpg_config.h
Log Message:
Fix multilib problem introduced in 8.2.x: new include file ecpg_config.h
is architecture-dependent.
--- NEW FILE ecpg_config.h ---
/*
* 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.
*
* To avoid breaking arches not explicitly supported by Red Hat, we
* use this indirection file *only* on known multilib arches.
*
* Note: this may well fail if user tries to use gcc's -I- option.
* But that option is deprecated anyway.
*/
#if defined(__x86_64__)
#include "ecpg_config_x86_64.h"
#elif defined(__i386__)
#include "ecpg_config_i386.h"
#elif defined(__ppc64__) || defined(__powerpc64__)
#include "ecpg_config_ppc64.h"
#elif defined(__ppc__) || defined(__powerpc__)
#include "ecpg_config_ppc.h"
#elif defined(__s390x__)
#include "ecpg_config_s390x.h"
#elif defined(__s390__)
#include "ecpg_config_s390.h"
#endif
Index: postgresql.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql/devel/postgresql.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- postgresql.spec 25 Aug 2007 20:53:39 -0000 1.82
+++ postgresql.spec 4 Sep 2007 17:26:37 -0000 1.83
@@ -81,7 +81,7 @@
Summary: PostgreSQL client programs and libraries
Name: postgresql
Version: 8.2.4
-Release: 5%{?dist}
+Release: 6%{?dist}
License: BSD
Group: Applications/Databases
Url: http://www.postgresql.org/
@@ -91,6 +91,7 @@
Source4: Makefile.regress
Source5: pg_config.h
Source6: README.rpm-dist
+Source7: ecpg_config.h
Source14: postgresql.pam
Source15: postgresql-bashprofile
Source16: filter-requires-perl-Pg.sh
@@ -484,6 +485,8 @@
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
install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/pgsql/server/
+ mv $RPM_BUILD_ROOT/usr/include/ecpg_config.h $RPM_BUILD_ROOT/usr/include/ecpg_config_`uname -i`.h
+ install -m 644 %{SOURCE7} $RPM_BUILD_ROOT/usr/include/
;;
*)
;;
@@ -819,6 +822,9 @@
%endif
%changelog
+* Tue Sep 4 2007 Tom Lane <tgl at redhat.com> 8.2.4-6
+- Fix multilib problem for /usr/include/ecpg_config.h (which is new in 8.2.x)
+
* Sat Aug 25 2007 Tom Lane <tgl at redhat.com> 8.2.4-5
- Use nicer solution for tzdata file substitution: upstream discussion
concluded that hardwiring the path was better than a symlink after all.
More information about the fedora-extras-commits
mailing list