- updated to 1.9

- pl

diff --git a/hwloc.spec b/hwloc.spec
index e4f9a189ead477ccedc0bc78b36c8e028930958c..3292c4caabb7e312640b1981227b2dd3801501f7 100644 (file)
--- a/hwloc.spec
+++ b/hwloc.spec
@@ -1,18 +1,30 @@
+# TODO: CUDA >= 30.20, NVML/nvidia-ml on bcond?
+# kerrighed >= 2.0 ?
+# myriexpress ?
 Summary:       Portable Hardware Locality
+Summary(pl.UTF-8):     Przenośna lokalizacja sprzętu
 Name:          hwloc
-Version:       1.3
+Version:       1.9
 Release:       1
 License:       BSD
 Group:         Applications/System
-Source0:       http://www.open-mpi.org/software/hwloc/v1.3/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: e3ba4029ff4956727431495b642d1afb
+Source0:       http://www.open-mpi.org/software/hwloc/v%{version}/downloads/%{name}-%{version}.tar.bz2
+# Source0-md5: 1954f690211227cb0a665624aab6aaa6
 URL:           http://www.open-mpi.org/projects/hwloc/
+BuildRequires: OpenCL-devel
+BuildRequires: OpenGL-devel
 BuildRequires: cairo-devel
-BuildRequires: libxml2-devel
+BuildRequires: libXNVCtrl-devel
+BuildRequires: libibverbs-devel
+BuildRequires: libltdl-devel
+BuildRequires: libstdc++-devel
+BuildRequires: libxml2-devel >= 2.0
+BuildRequires: ncurses-devel
 BuildRequires: numactl-devel
-BuildRequires: pciutils-devel
-BuildRequires: pkgconfig >= 0.9.0
+BuildRequires: pkgconfig >= 1:0.9.0
 BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXext-devel
+BuildRequires: xorg-lib-libpciaccess-devel
 BuildRequires: xorg-proto-xproto-devel
 Requires:      %{name}-libs = %{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -27,27 +39,51 @@ information. It primarily aims at helping applications with gathering
 information about modern computing hardware so as to exploit it
 accordingly and efficiently.
 
+%description -l pl.UTF-8
+Pakiet HWLOC (Portable Hardware Locality) zapewnia przenośną (między
+systemami operacyjnymi, werjami, architekturami...) abstrakcję
+hierarchicznej topologii współczesnych architektur, w tym węzłów z
+pamięcią NUMA, gniazd, współdzielonych pamięci podręcznych, rdzeni i
+wielowątkowości. Gromadzi też różne właściwości systemów, takie jak
+informacje o pamięci głównej i podręcznej. Głównym celem jest pomoc
+aplikacjom w gromadzeniu informacji o współczesnym sprzęcie
+obliczeniowym w celu jego właściwego i wydajnego wykorzystania.
+
 %package libs
-Summary:       %{name} library
+Summary:       Portable Hardware Locality (hwloc) library
+Summary(pl.UTF-8):     Biblioteka przenośnej lokalizacji sprzętu (hwloc)
 Group:         Libraries
 
 %description libs
-%{name} library.
+Portable Hardware Locality (hwloc) library.
+
+%description libs -l pl.UTF-8
+Biblioteka przenośnej lokalizacji sprzętu (hwloc).
 
 %package devel
-Summary:       Header files for %{name} library
+Summary:       Header files for hwloc library
+Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki hwloc
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
+Requires:      OpenCL-devel
+Requires:      libxml2-devel >= 2.0
+Requires:      numactl-devel
+Requires:      xorg-lib-libpciaccess-devel
 
 %description devel
-Header files for %{name} library.
+Header files for hwloc library.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki hwloc.
 
 %prep
 %setup -q
 
 %build
-%configure
-%{__make} V=1
+%configure \
+       --enable-plugins \
+       --disable-silent-rules
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -55,7 +91,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib%{name}.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libhwloc.la \
+       $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -65,25 +102,32 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/%{name}-*
+%attr(755,root,root) %{_bindir}/hwloc-*
 %attr(755,root,root) %{_bindir}/lstopo
+%attr(755,root,root) %{_bindir}/lstopo-no-graphics
+%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/hwloc_opencl.so
+%attr(755,root,root) %{_libdir}/%{name}/hwloc_pci.so
+%attr(755,root,root) %{_libdir}/%{name}/hwloc_xml_libxml.so
 %{_datadir}/%{name}
-%{_mandir}/man1/%{name}-*.1*
+%{_mandir}/man1/hwloc-*.1*
 %{_mandir}/man1/lstopo.1*
-%{_mandir}/man7/%{name}.7*
+%{_mandir}/man1/lstopo-no-graphics.1*
+%{_mandir}/man7/hwloc.7*
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib%{name}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/lib%{name}.so.4
+%doc AUTHORS COPYING NEWS README
+%attr(755,root,root) %{_libdir}/libhwloc.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libhwloc.so.5
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/doxygen-doc/html doc/doxygen-doc/%{name}-*.pdf
-%attr(755,root,root) %{_libdir}/lib%{name}.so
-%{_pkgconfigdir}/%{name}.pc
-%{_includedir}/%{name}
-%{_includedir}/%{name}.h
+%doc doc/doxygen-doc/html doc/doxygen-doc/hwloc-a4.pdf
+%attr(755,root,root) %{_libdir}/libhwloc.so
+%{_pkgconfigdir}/hwloc.pc
+%{_includedir}/hwloc
+%{_includedir}/hwloc.h
 %{_mandir}/man3/HWLOC_*.3*
 %{_mandir}/man3/hwloc_*.3*
 %{_mandir}/man3/hwlocality_*.3*