[ntl] 5.5.2-5

[Rex Dieter]

commit 5e9d869874aa171e3cc5763b2d60a882d9e488e9
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Jul 31 08:56:46 2012 -0500

    5.5.2-5
    
    - better multilib conflict handling (%{__isa_bits})
    - tighten subpkg deps (%{?_isa})

 multilib_template.h |   30 ++++++++++++------------------
 ntl.spec            |   16 ++++++++++------
 2 files changed, 22 insertions(+), 24 deletions(-)
---
diff --git a/multilib_template.h b/multilib_template.h
index db993fe..d36971c 100644
--- a/multilib_template.h
+++ b/multilib_template.h
@@ -1,24 +1,18 @@
 /* This file is here to prevent a file conflict on multiarch systems.  A
- * conflict will occur because apr.h has arch-specific definitions.
+ * conflict will occur because @@INCLUDE@@ has arch-specific definitions.
  *
  * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */
 
-#if defined(__x86_64__)
-#include "@@INCLUDE@@-x86_64.h"
-#elif defined(__i386__)
-#include "@@INCLUDE@@-i386.h"
-#elif defined(__powerpc64__)
-#include "@@INCLUDE@@-ppc64.h"
-#elif defined(__powerpc__)
-#include "@@INCLUDE@@-ppc.h"
-#elif defined(__s390x__)
-#include "@@INCLUDE@@-s390x.h"
-#elif defined(__s390__)
-#include "@@INCLUDE@@-s390.h"
-#elif defined(__sparc__) && defined (__arch64__)
-#include "@@INCLUDE@@-sparc64.h"
-#elif defined(__sparc__)
-#include "@@INCLUDE@@-sparc.h"
+#ifndef @@INCLUDE_MACRO@@_MULTILIB_H
+#define @@INCLUDE_MACRO@@_MULTILIB_H
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "@@INCLUDE@@"
+#elif __WORDSIZE == 64
+#include "@@INCLUDE@@"
 #else
-#error "This @@PACKAGENAME@@ package does not work your architecture?"
+#error "unexpected value for __WORDSIZE macro"
+#endif
+
 #endif
diff --git a/ntl.spec b/ntl.spec
index d3f55c1..7c5a51d 100644
--- a/ntl.spec
+++ b/ntl.spec
@@ -7,7 +7,7 @@
 Summary: High-performance algorithms for vectors, matrices, and polynomials 
 Name:    ntl 
 Version: 5.5.2
-Release: 4%{?dist}.2
+Release: 5%{?dist}
 
 License: GPLv2+
 URL:     http://shoup.net/ntl/ 
@@ -41,14 +41,14 @@ NTL provides high quality implementations of state-of-the-art algorithms for:
 %package devel 
 Summary: Development files for %{name} 
 Group:   Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 %description devel 
 %{summary}.
 
 %package static 
 Summary: Static libraries for %{name}
 Group:   Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
+Requires: %{name}-devel%{?_isa} = %{version}-%{release}
 #Requires: gmp-devel
 %description static 
 %{summary}.
@@ -102,11 +102,11 @@ rm -f  %{buildroot}%{_libdir}/libntl.a
 # hack to allow parallel installation of multilib factory-devel
 for header in NTL/config NTL/gmp_aux NTL/mach_desc  ; do
 mv  %{buildroot}%{_includedir}/${header}.h \
-    %{buildroot}%{_includedir}/${header}-%{_arch}.h
+    %{buildroot}%{_includedir}/${header}-%{__isa_bits}.h
 install -p -m644 %{SOURCE1} %{buildroot}%{_includedir}/${header}.h
 sed -i \
-  -e "s|@@INCLUDE@@|${header}|" \
-  -e "s|@@PACKAGENAME@@|%{name}-devel|" \
+  -e "s|@@INCLUDE@@|${header}.h|" \
+  -e "s|@@INCLUDE_MACRO@@|$(echo ${header} | tr '/.' '_')|" \
   %{buildroot}%{_includedir}/${header}.h
 done
 %endif
@@ -135,6 +135,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Jul 31 2012 Rex Dieter <rdieter at fedoraproject.org> - 5.5.2-5
+- better multilib conflict handling (%%{__isa_bits})
+- tighten subpkg deps (%%{?_isa})
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.5.2-4.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild