orion pushed to hwloc (f22). "Update to version 1.10.1"

[notifications at fedoraproject.org]

>From f83a4a61bd689e2f9bc4d0a7930aeb74f51e628a Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion at cora.nwra.com>
Date: Wed, 1 Apr 2015 21:02:46 -0600
Subject: Update to version 1.10.1


diff --git a/hwloc.spec b/hwloc.spec
index 414979c..fd59073 100644
--- a/hwloc.spec
+++ b/hwloc.spec
@@ -1,12 +1,11 @@
 Summary:   Portable Hardware Locality - portable abstraction of hierarchical architectures
 Name:      hwloc
-Version:   1.10.0
+Version:   1.10.1
 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
+Source0:   http://www.open-mpi.org/software/hwloc/v1.10/downloads/%{name}-%{version}.tar.bz2
 Requires:  %{name}-libs%{?_isa} = %{version}-%{release}
 
 BuildRequires: cairo-devel
@@ -19,6 +18,7 @@ BuildRequires: ncurses-devel
 BuildRequires: transfig doxygen w3m
 BuildRequires: texlive-latex texlive-makeindex
 BuildRequires: autoconf automake libtool
+BuildRequires: desktop-file-utils
 %ifnarch s390 s390x
 BuildRequires: libibverbs-devel
 %endif
@@ -91,8 +91,7 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 cp -p AUTHORS COPYING NEWS README VERSION %{buildroot}%{_defaultdocdir}/%{name}
 cp -pr doc/examples %{buildroot}%{_defaultdocdir}/%{name}
 
-rm %{buildroot}%{_datadir}/applications/hwloc-ls.desktop
-cp -p %{SOURCE1} %{buildroot}%{_datadir}/applications
+desktop-file-validate %{buildroot}/%{_datadir}/applications/lstopo.desktop
 
 rm %{buildroot}%{_mandir}/man1/lstopo-no-graphics.1
 rm %{buildroot}%{_mandir}/man1/hwloc-ls.1
@@ -100,7 +99,6 @@ mv %{buildroot}%{_mandir}/man1/lstopo.1 %{buildroot}%{_mandir}/man1/lstopo-no-gr
 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
 
@@ -135,13 +133,16 @@ make check
 %files gui
 %{_bindir}/lstopo
 %{_mandir}/man1/lstopo.1*
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/lstopo.desktop
 
 %files plugins
 %dir %{_libdir}/%{name}
 %{_libdir}/hwloc*
 
 %changelog
+* Wed Apr 1 2015 Orion Poplwski <orion at cora.nwra.com> - 1.10.1-1
+- Update to version 1.10.1
+
 * Tue Oct 07 2014 Jirka Hladky <hladky.jiri at gmail.com> - 1.10.0-1
 - Update to version 1.10.0
 
diff --git a/sources b/sources
index dc9eddc..bb00f1f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-c0502d93b1b8800cde28f84010bccfe0  hwloc-1.10.0.tar.bz2
-3513a8260cf3ea8f7d787b08f74b3c6b  lstopo.desktop
+f53c1f00bd857b291a89c8926772886e  hwloc-1.10.1.tar.bz2
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/hwloc.git/commit/?h=f22&id=f83a4a61bd689e2f9bc4d0a7930aeb74f51e628a