[pciutils/f13/master] - different approach to fix multilib issues

[Michal Hlavinka]

commit a8edc3ff976fad11d50bca993c9c004c382d301a
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Tue Jan 18 15:36:03 2011 +0100

    - different approach to fix multilib issues

 multilibconfigh |    9 +++++++++
 pciutils.spec   |    9 +++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/multilibconfigh b/multilibconfigh
new file mode 100644
index 0000000..82171e1
--- /dev/null
+++ b/multilibconfigh
@@ -0,0 +1,9 @@
+#if defined(__x86_64__) || defined(__ia64__) || defined(__ppc64__) || defined(__powerpc64__)
+#include "config.lib64.h"
+#elif defined(__sparc__) && defined (__arch64__)
+#include "config.lib64.h"
+#elif defined(__i386__) || defined(__ppc__)  || defined(__powerpc__) || defined(__s390x__) || defined(__s390__) || defined(__alpha__) || defined(__sparc__) || defined(__sh__) || defined(__arm__)
+#include "config.lib.h"
+#else
+#error Unknown Arch
+#endif
diff --git a/pciutils.spec b/pciutils.spec
index 106d1b7..2382c26 100644
--- a/pciutils.spec
+++ b/pciutils.spec
@@ -1,7 +1,8 @@
 Name:		pciutils
 Version:	3.1.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
+Source1:        multilibconfigh
 
 #truncate too long names (#205948)
 Patch1:		pciutils-2.2.4-buf.patch
@@ -97,7 +98,8 @@ install -p -m 644 lib/libpci.a $RPM_BUILD_ROOT%{_libdir}
 /sbin/ldconfig -N $RPM_BUILD_ROOT/%{_lib}
 install -p lib/pci.h $RPM_BUILD_ROOT%{_includedir}/pci
 install -p lib/header.h $RPM_BUILD_ROOT%{_includedir}/pci
-install -p lib/config.h $RPM_BUILD_ROOT%{_includedir}/pci
+install -p %{SOURCE1} $RPM_BUILD_ROOT%{_includedir}/pci/config.h
+install -p lib/config.h $RPM_BUILD_ROOT%{_includedir}/pci/config.%{_lib}.h
 install -p lib/types.h $RPM_BUILD_ROOT%{_includedir}/pci
 install -p lib/libpci.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 
@@ -132,6 +134,9 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Jan 18 2011 Michal Hlavinka <mhlavink at redhat.com> - 3.1.7-3
+- different approach to fix multilib issues
+
 * Mon Jan 10 2011 Michal Hlavinka <mhlavink at redhat.com> - 3.1.7-2
 - removed obsolete patches