Update to 1.10

.gitignore

@@ -1 +1,2 @@
 /hwloc-*.tar.bz2
+/lstopo.desktop

hwloc.spec

@@ -1,11 +1,12 @@
 Summary:   Portable Hardware Locality - portable abstraction of hierarchical architectures
 Name:      hwloc
-Version:   1.9.1
+Version:   1.10.0
 Release:   1%{?dist}
 License:   BSD
 Group:     Applications/System
 URL:       http://www.open-mpi.org/projects/hwloc/
 Source0:   http://www.open-mpi.org/software/hwloc/v%{version}/downloads/%{name}-%{version}.tar.bz2
+Source1:   lstopo.desktop
 Requires:  %{name}-libs%{?_isa} = %{version}-%{release}
 
 BuildRequires: cairo-devel
@@ -88,7 +89,17 @@ make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 cp -p AUTHORS COPYING NEWS README VERSION %{buildroot}%{_defaultdocdir}/%{name}
-cp -p doc/hwloc-hello.c %{buildroot}%{_defaultdocdir}/%{name}
+cp -pr doc/examples %{buildroot}%{_defaultdocdir}/%{name}
+
+rm %{buildroot}%{_datadir}/applications/hwloc-ls.desktop
+cp -p %{SOURCE1} %{buildroot}%{_datadir}/applications
+
+rm %{buildroot}%{_mandir}/man1/lstopo-no-graphics.1
+rm %{buildroot}%{_mandir}/man1/hwloc-ls.1
+mv %{buildroot}%{_mandir}/man1/lstopo.1 %{buildroot}%{_mandir}/man1/lstopo-no-graphics.1
+ln -rs %{buildroot}%{_mandir}/man1/lstopo-no-graphics.1 %{buildroot}%{_mandir}/man1/lstopo.1
+ln -rs %{buildroot}%{_mandir}/man1/lstopo-no-graphics.1 %{buildroot}%{_mandir}/man1/hwloc-ls.1
+
 
 %check
 make check
@@ -109,7 +120,7 @@ make check
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/*
 %{_includedir}/%{name}.h
-%{_defaultdocdir}/%{name}/*c
+%{_defaultdocdir}/%{name}/examples
 %{_libdir}/*.so
 
 %files libs
@@ -123,13 +134,17 @@ make check
 
 %files gui
 %{_bindir}/lstopo
-%{_mandir}/man1/lstopo.*
+%{_mandir}/man1/lstopo.1*
+%{_datadir}/applications/*.desktop
 
 %files plugins
 %dir %{_libdir}/%{name}
 %{_libdir}/hwloc*
 
 %changelog
+* Tue Oct 07 2014 Jirka Hladky <hladky.jiri@gmail.com> - 1.10.0-1
+- Update to version 1.10.0
+
 * Fri Sep 26 2014 Jirka Hladky <hladky.jiri@gmail.com> - 1.9.1-1
 - Update to version 1.9.1
 - Added support for plugins

sources

@@ -1 +1,2 @@
-d667bea2ab65af7d8cddaf0f440eb415  hwloc-1.9.1.tar.bz2
+c0502d93b1b8800cde28f84010bccfe0  hwloc-1.10.0.tar.bz2
+3513a8260cf3ea8f7d787b08f74b3c6b  lstopo.desktop