[libsigsegv] drop multilib hacks altogether (haven't been used since 2.9-2)

[Rex Dieter]

commit b2750cf6d8e69dacd9efcd996b56d99ffc1ce192
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Apr 5 08:49:22 2012 -0500

    drop multilib hacks altogether (haven't been used since 2.9-2)

 libsigsegv.spec   |   30 ++++++++++--------------------
 sigsegv-wrapper.h |   29 ++++++++++++-----------------
 2 files changed, 22 insertions(+), 37 deletions(-)
---
diff --git a/libsigsegv.spec b/libsigsegv.spec
index a658912..cebbf8c 100644
--- a/libsigsegv.spec
+++ b/libsigsegv.spec
@@ -1,10 +1,8 @@
 
-#define multilib_arches %{ix86} x86_64 ppc ppc64 s390 s390x sparcv9 sparc64
-
 Summary: Library for handling page faults in user mode
 Name:    libsigsegv
 Version: 2.10
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2+
 URL:     http://libsigsegv.sourceforge.net/
@@ -61,15 +59,6 @@ rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot}
 
-%ifarch %{?multilib_arches}
-# hack to allow parallel installation on 32-bit and 64-bit
-  mv  %{buildroot}%{_includedir}/sigsegv.h \
-      %{buildroot}%{_includedir}/sigsegv-%{_arch}.h
-  install -p -m644 %{SOURCE1}  %{buildroot}%{_includedir}/sigsegv.h
-%endif
-
-rm -f %{buildroot}%{_libdir}/lib*.la
-
 %if 0%{?fedora} > 11
 # move shlib to %{_lib}
 pushd %{buildroot}%{_libdir}
@@ -79,20 +68,21 @@ ln -sf ../../%{_lib}/libsigsegv.so.2 %{buildroot}%{_libdir}/libsigsegv.so
 popd
 %endif
 
+## unpackaged files
+rm -f %{buildroot}%{_libdir}/lib*.la
+
 
 %check
 make check
 
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-
 %clean
 rm -rf %{buildroot} 
 
 
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README
@@ -106,9 +96,6 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_libdir}/libsigsegv.so
 %{_includedir}/sigsegv.h
-%ifarch %{multilib_arches}
-%{_includedir}/sigsegv-%{_arch}.h
-%endif
 
 %files static
 %defattr(-,root,root,-)
@@ -116,6 +103,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Apr 05 2012 Rex Dieter <rdieter at fedoraproject.org> 2.10-3
+- drop multilib hacks altogether (haven't been used since 2.9-2)
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sigsegv-wrapper.h b/sigsegv-wrapper.h
index bb001c0..e3e3664 100644
--- a/sigsegv-wrapper.h
+++ b/sigsegv-wrapper.h
@@ -3,22 +3,17 @@
  *
  * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */
 
-#if defined(__x86_64__)
-#include "sigsegv-x86_64.h"
-#elif defined(__i386__)
-#include "sigsegv-i386.h"
-#elif defined(__powerpc64__)
-#include "sigsegv-ppc64.h"
-#elif defined(__powerpc__)
-#include "sigsegv-ppc.h"
-#elif defined(__s390x__)
-#include "sigsegv-s390x.h"
-#elif defined(__s390__)
-#include "sigsegv-s390.h"
-#elif defined(__sparc__) && defined (__arch64__)
-#include "sigsegv-sparc64.h"
-#elif defined(__sparc__)
-#include "sigsegv-sparc.h"
+#ifndef SIGSEGV_MULTILIB_H
+#define SIGSEGV_MULTILIB_H
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "sigsegv-32.h"
+#elif __WORDSIZE == 64
+#include "sigsegv-64.h"
 #else
-#error "This libsigsegv-devel package does not work your architecture?"
+#error "unexpected value for __WORDSIZE macro"
+#endif
+
 #endif
+