[ntl] Broken ntl-devel due to problems in multilib support (#846497)
Rex Dieter
rdieter at fedoraproject.org
Wed Aug 8 23:53:00 UTC 2012
commit 5e9c5e726d7caa641a390c7643e2473432e71ac1
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Wed Aug 8 18:56:30 2012 -0500
Broken ntl-devel due to problems in multilib support (#846497)
multilib_template.h | 4 ++--
ntl.spec | 9 ++++++---
2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/multilib_template.h b/multilib_template.h
index d36971c..64b06d4 100644
--- a/multilib_template.h
+++ b/multilib_template.h
@@ -8,9 +8,9 @@
#include <bits/wordsize.h>
#if __WORDSIZE == 32
-#include "@@INCLUDE@@"
+#include "@@INCLUDE@@-32.h"
#elif __WORDSIZE == 64
-#include "@@INCLUDE@@"
+#include "@@INCLUDE@@-64.h"
#else
#error "unexpected value for __WORDSIZE macro"
#endif
diff --git a/ntl.spec b/ntl.spec
index 54bfa12..869aea7 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: 6%{?dist}
+Release: 7%{?dist}
License: GPLv2+
URL: http://shoup.net/ntl/
@@ -109,7 +109,7 @@ mv %{buildroot}%{_includedir}/${header}.h \
%{buildroot}%{_includedir}/${header}-%{__isa_bits}.h
install -p -m644 %{SOURCE1} %{buildroot}%{_includedir}/${header}.h
sed -i \
- -e "s|@@INCLUDE@@|${header}.h|" \
+ -e "s|@@INCLUDE@@|${header}|" \
-e "s|@@INCLUDE_MACRO@@|$(echo ${header} | tr '/.' '_')|" \
%{buildroot}%{_includedir}/${header}.h
done
@@ -124,7 +124,7 @@ done
%files devel
%defattr(-,root,root,-)
%doc doc/*
-%{_includedir}/*
+%{_includedir}/NTL/
%{_libdir}/libntl.so
%if 0%{?static}
@@ -135,6 +135,9 @@ done
%changelog
+* Wed Aug 08 2012 Rex Dieter <rdieter at fedoraproject.org> 5.5.2-7
+- Broken ntl-devel due to problems in multilib support (#846497)
+
* Wed Aug 1 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 5.5.2-6
- Add tag to mode options for libtool (fixes FTBFS on ARM)
More information about the scm-commits
mailing list