[openmpi: 2/2] Merge in changes in master

[Orion Poplawski]

commit c284a0ef04f4619e16768418b0b085d989e4db23
Merge: 5a655f8 94582f7
Author: Orion Poplawski <orion at nwra.com>
Date:   Fri Jul 26 16:32:31 2013 -0600

    Merge in changes in master

 openmpi.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --cc openmpi.spec
index d54d3b1,0e0f56d..b217c82
--- a/openmpi.spec
+++ b/openmpi.spec
@@@ -19,7 -19,7 +19,7 @@@
  
  Name:			openmpi%{?_cc_name_suffix}
  Version:		1.7.2
- Release:		2%{?dist}
 -Release:		3%{?dist}
++Release:		4%{?dist}
  Summary:		Open Message Passing Interface
  Group:			Development/Libraries
  License:		BSD, MIT and Romio
@@@ -238,9 -238,12 +238,15 @@@ make chec
  %{_sysconfdir}/rpm/macros.%{namearch}
  
  %changelog
- * Fri Jul 26 2013 Orion Poplawski <orion at cora.nwra.com> 1.7.2-2
++* Fri Jul 26 2013 Orion Poplawski <orion at cora.nwra.com> 1.7.2-4
 +- Fix build issue with _cc_name_suffix (bug #986664)
 +
+ * Mon Jul 22 2013 Deji Akingunola <dakingun at gmail.com> - 1.7.2-3
+ - Rebuild for papi's shared lib fix
+ 
+ * Wed Jul 17 2013 Petr Pisar <ppisar at redhat.com> - 1.7.2-2
+ - Perl 5.18 rebuild
+ 
  * Thu Jun 27 2013 Orion Poplawski <orion at cora.nwra.com> 1.7.2-1
  - Update to 1.7.2