Fix for BZ1253977

This commit is contained in:
Jirka Hladky 2015-08-18 14:37:35 +02:00
parent d9e78576e5
commit 6b260dd571

View File

@ -1,7 +1,7 @@
Summary: Portable Hardware Locality - portable abstraction of hierarchical architectures Summary: Portable Hardware Locality - portable abstraction of hierarchical architectures
Name: hwloc Name: hwloc
Version: 1.11.0 Version: 1.11.0
Release: 2%{?dist} Release: 3%{?dist}
License: BSD License: BSD
Group: Applications/System Group: Applications/System
URL: http://www.open-mpi.org/projects/hwloc/ URL: http://www.open-mpi.org/projects/hwloc/
@ -92,6 +92,8 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
cp -p AUTHORS COPYING NEWS README VERSION %{buildroot}%{_defaultdocdir}/%{name} cp -p AUTHORS COPYING NEWS README VERSION %{buildroot}%{_defaultdocdir}/%{name}
cp -pr doc/examples %{buildroot}%{_defaultdocdir}/%{name} cp -pr doc/examples %{buildroot}%{_defaultdocdir}/%{name}
# Fix for BZ1253977
mv %{buildroot}%{_defaultdocdir}/%{name}/examples/Makefile %{buildroot}%{_defaultdocdir}/%{name}/examples/Makefile_%{_arch}
desktop-file-validate %{buildroot}/%{_datadir}/applications/lstopo.desktop desktop-file-validate %{buildroot}/%{_datadir}/applications/lstopo.desktop
@ -120,14 +122,14 @@ make check
%{_includedir}/%{name}.h %{_includedir}/%{name}.h
%{_defaultdocdir}/%{name}/examples %{_defaultdocdir}/%{name}/examples
%{_libdir}/*.so %{_libdir}/*.so
%files libs
%{_mandir}/man7/%{name}* %{_mandir}/man7/%{name}*
%dir %{_datadir}/%{name} %dir %{_datadir}/%{name}
%{_datadir}/%{name}/%{name}.dtd %{_datadir}/%{name}/%{name}.dtd
%{_datadir}/%{name}/%{name}-valgrind.supp %{_datadir}/%{name}/%{name}-valgrind.supp
%dir %{_defaultdocdir}/%{name} %dir %{_defaultdocdir}/%{name}
%{_defaultdocdir}/%{name}/*[^c] %{_defaultdocdir}/%{name}/*[^c]
%files libs
%{_libdir}/libhwloc*so.5* %{_libdir}/libhwloc*so.5*
%files gui %files gui
@ -140,8 +142,8 @@ make check
%{_libdir}/hwloc* %{_libdir}/hwloc*
%changelog %changelog
* Tue Aug 18 2015 Jirka Hladky <hladky.jiri@gmail.com> - 1.10.0-2 * Tue Aug 18 2015 Jirka Hladky <hladky.jiri@gmail.com> - 1.10.0-3
- Moved all doc files from lib to devel subpackage to allow i686 and x86_64 libraries to be installed alongside - Fix for BZ1253977
* Tue Jul 21 2015 Orion Poplwski <orion@cora.nwra.com> - 1.11.0-1 * Tue Jul 21 2015 Orion Poplwski <orion@cora.nwra.com> - 1.11.0-1
- Update to version 1.11.0 (fixes bug #1208279) - Update to version 1.11.0 (fixes bug #1208279)