[pciutils/f14/master] - fix the multilib header on s390x

[Dan Horák]

commit b9e3f60bd5fc43bd8a45f2980065dfab8a0ff7c1
Author: Dan Horák <dan at danny.cz>
Date:   Wed Jan 26 11:29:21 2011 +0100

    - fix the multilib header on s390x

 multilibconfigh |    4 ++--
 pciutils.spec   |    5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/multilibconfigh b/multilibconfigh
index 82171e1..8bce823 100644
--- a/multilibconfigh
+++ b/multilibconfigh
@@ -1,8 +1,8 @@
-#if defined(__x86_64__) || defined(__ia64__) || defined(__ppc64__) || defined(__powerpc64__)
+#if defined(__x86_64__) || defined(__ia64__) || defined(__ppc64__) || defined(__powerpc64__) || defined(__s390x__)
 #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__)
+#elif defined(__i386__) || defined(__ppc__)  || defined(__powerpc__) || defined(__s390__) || defined(__alpha__) || defined(__sparc__) || defined(__sh__) || defined(__arm__)
 #include "config.lib.h"
 #else
 #error Unknown Arch
diff --git a/pciutils.spec b/pciutils.spec
index 2382c26..92ee90a 100644
--- a/pciutils.spec
+++ b/pciutils.spec
@@ -1,6 +1,6 @@
 Name:		pciutils
 Version:	3.1.7
-Release:	3%{?dist}
+Release:	4%{?dist}
 Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
 Source1:        multilibconfigh
 
@@ -134,6 +134,9 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jan 26 2011 Dan Horák <dan[at]danny.cz> - 3.1.7-4
+- fix the multilib header on s390x
+
 * Tue Jan 18 2011 Michal Hlavinka <mhlavink at redhat.com> - 3.1.7-3
 - different approach to fix multilib issues