Use __isa_bits macro instead of list of 64-bit architectures

credits:  Marcin Juszkiewicz
This commit is contained in:
Michal Hlavinka 2015-08-27 16:24:27 +02:00
parent 89866e6d57
commit 5aafa63b10

View File

@ -1,7 +1,7 @@
Summary: Library for reading and writing sound files
Name: libsndfile
Version: 1.0.25
Release: 16%{?dist}
Release: 17%{?dist}
License: LGPLv2+ and GPLv2+ and BSD
Group: System Environment/Libraries
URL: http://www.mega-nerd.com/libsndfile/
@ -83,14 +83,8 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/libsndfile1-dev
find %{buildroot} -type f -name "*.la" -delete
# fix multilib issues
%ifarch aarch64 %{power64} s390x x86_64
%define wordsize 64
%else
%define wordsize 32
%endif
mv %{buildroot}%{_includedir}/sndfile.h \
%{buildroot}%{_includedir}/sndfile-%{wordsize}.h
%{buildroot}%{_includedir}/sndfile-%{__isa_bits}.h
cat > %{buildroot}%{_includedir}/sndfile.h <<EOF
#include <bits/wordsize.h>
@ -150,12 +144,15 @@ LD_LIBRARY_PATH=$PWD/src/.libs make check
%doc __docs/* ChangeLog
%{_includedir}/sndfile.h
%{_includedir}/sndfile.hh
%{_includedir}/sndfile-%{wordsize}.h
%{_includedir}/sndfile-%{__isa_bits}.h
%{_libdir}/%{name}.so
%{_libdir}/pkgconfig/sndfile.pc
%changelog
* Thu Aug 27 2015 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 1.0.25-17
- Use __isa_bits macro instead of list of 64-bit architectures
* Sun Jul 19 2015 Peter Robinson <pbrobinson@fedoraproject.org> 1.0.25-16
- Fix FTBFS
- Use %%license