Broken ntl-devel due to problems in multilib support (#846497)

This commit is contained in:
Rex Dieter 2012-08-08 18:56:30 -05:00
parent 1843df9975
commit 5e9c5e726d
2 changed files with 8 additions and 5 deletions

View File

@ -8,9 +8,9 @@
#include <bits/wordsize.h> #include <bits/wordsize.h>
#if __WORDSIZE == 32 #if __WORDSIZE == 32
#include "@@INCLUDE@@" #include "@@INCLUDE@@-32.h"
#elif __WORDSIZE == 64 #elif __WORDSIZE == 64
#include "@@INCLUDE@@" #include "@@INCLUDE@@-64.h"
#else #else
#error "unexpected value for __WORDSIZE macro" #error "unexpected value for __WORDSIZE macro"
#endif #endif

View File

@ -7,7 +7,7 @@
Summary: High-performance algorithms for vectors, matrices, and polynomials Summary: High-performance algorithms for vectors, matrices, and polynomials
Name: ntl Name: ntl
Version: 5.5.2 Version: 5.5.2
Release: 6%{?dist} Release: 7%{?dist}
License: GPLv2+ License: GPLv2+
URL: http://shoup.net/ntl/ URL: http://shoup.net/ntl/
@ -109,7 +109,7 @@ mv %{buildroot}%{_includedir}/${header}.h \
%{buildroot}%{_includedir}/${header}-%{__isa_bits}.h %{buildroot}%{_includedir}/${header}-%{__isa_bits}.h
install -p -m644 %{SOURCE1} %{buildroot}%{_includedir}/${header}.h install -p -m644 %{SOURCE1} %{buildroot}%{_includedir}/${header}.h
sed -i \ sed -i \
-e "s|@@INCLUDE@@|${header}.h|" \ -e "s|@@INCLUDE@@|${header}|" \
-e "s|@@INCLUDE_MACRO@@|$(echo ${header} | tr '/.' '_')|" \ -e "s|@@INCLUDE_MACRO@@|$(echo ${header} | tr '/.' '_')|" \
%{buildroot}%{_includedir}/${header}.h %{buildroot}%{_includedir}/${header}.h
done done
@ -124,7 +124,7 @@ done
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc doc/* %doc doc/*
%{_includedir}/* %{_includedir}/NTL/
%{_libdir}/libntl.so %{_libdir}/libntl.so
%if 0%{?static} %if 0%{?static}
@ -135,6 +135,9 @@ done
%changelog %changelog
* Wed Aug 08 2012 Rex Dieter <rdieter@fedoraproject.org> 5.5.2-7
- Broken ntl-devel due to problems in multilib support (#846497)
* Wed Aug 1 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 5.5.2-6 * Wed Aug 1 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 5.5.2-6
- Add tag to mode options for libtool (fixes FTBFS on ARM) - Add tag to mode options for libtool (fixes FTBFS on ARM)