[hdf5/epel7: 13/13] Merge with devel

[Orion Poplawski]

commit 72bd0d417696aed0e97bbd13312a01ed4acaa9d1
Merge: 62bdcc0 a77fb8a
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue Jan 14 20:39:33 2014 -0700

    Merge with devel

 .gitignore         |    5 +
 hdf5-aarch64.patch | 1527 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 hdf5.spec          |   84 ++-
 sources            |    4 +-
 4 files changed, 1592 insertions(+), 28 deletions(-)
---
diff --cc hdf5.spec
index c3251af,7fe1125..5a38d61
--- a/hdf5.spec
+++ b/hdf5.spec
@@@ -74,8 -79,8 +79,7 @@@ Summary: HDF5 mpich librarie
  Group: Development/Libraries
  Requires: mpich
  BuildRequires: mpich-devel
--Provides: %{name}-mpich2 = %{version}-%{release}
- Obsoletes: %{name}-mpich2 < 1.8.10-4
+ Obsoletes: %{name}-mpich2 < 1.8.11-4
  
  %description mpich
  HDF5 parallel mpich libraries