[numactl: 2/2] Resolves: bz1080421

[Petr Holasek]

commit 267ede3def307a7d01d1a6071bc9d8cda46b094f
Merge: 0bca0ad 43c2169
Author: Petr Holasek <pholasek at redhat.com>
Date:   Thu Jul 31 15:59:25 2014 +0200

    Resolves: bz1080421
    
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/numactl
    
    Conflicts:
    	numactl.spec

 numactl.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc numactl.spec
index d08f334,9789e4b..47e3ebc
--- a/numactl.spec
+++ b/numactl.spec
@@@ -1,7 -1,7 +1,7 @@@
  Name:		numactl
  Summary:	Library for tuning for Non Uniform Memory Access machines
  Version:	2.0.9
--Release:	2%{dist}
++Release:	3%{dist}
  # libnuma is LGPLv2 and GPLv2
  # numactl binaries are GPLv2 only
  License:	GPLv2
@@@ -88,9 -85,9 +88,12 @@@ rm -rf $RPM_BUILD_ROO
  %{_mandir}/man3/*.3*
  
  %changelog
- * Thu Jul 31 2014 Petr Holasek <pholasek at redhat.com> 2.0.9-2
++* Thu Jul 31 2014 Petr Holasek <pholasek at redhat.com> 2.0.9-3
 +- fixed segfault on non-NUMA systems (bz1080421)
 +
+ * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.9-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
  * Wed Oct 09 2013 Petr Holasek <pholasek at redhat.com> 2.0.9-1
  - rebased to version 2.0.9