From 16d3653a77a7615143377e287f48ed9499addca3 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Wed, 9 Mar 2016 09:12:45 -0700
Subject: [PATCH] Update to 1.2.0

- Use psm/psm2 if possible on EL
---
 .gitignore     |  1 +
 libfabric.spec | 16 +++++++++++++---
 sources        |  2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1bd9855..12d162b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /libfabric-1.1.0.tar.bz2
+/libfabric-1.2.0.tar.bz2
diff --git a/libfabric.spec b/libfabric.spec
index 7d347fb..822d73d 100644
--- a/libfabric.spec
+++ b/libfabric.spec
@@ -1,14 +1,20 @@
 Name:           libfabric
-Version:        1.1.0
-Release:        2%{?dist}
+Version:        1.2.0
+Release:        1%{?dist}
 Summary:        Open Fabric Interfaces
 
 License:        BSD or GPLv2
 URL:            http://ofiwg.github.io/libfabric/
 Source0:        http://downloads.openfabrics.org/downloads/ofi/libfabric-%{version}.tar.bz2
 
+%if 0%{?rhel} >= 6
+BuildRequires:  infinipath-psm-devel
+%endif
 BuildRequires:  libibverbs-devel
 BuildRequires:  libnl3-devel
+%if 0%{?rhel} >= 7
+BuildRequires:  libpsm2-devel
+%endif
 BuildRequires:  librdmacm-devel
 
 %description
@@ -53,7 +59,6 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 
 %files
-%{!?_licensedir:%global license %%doc}
 %license COPYING
 %{_bindir}/fi_info
 %{_libdir}/*.so.1*
@@ -65,11 +70,16 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 # https://github.com/ofiwg/libfabric/issues/1277
 %{_includedir}/rdma/
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/%{name}.pc
 %{_mandir}/man3/*.3*
 %{_mandir}/man7/*.7*
 
 
 %changelog
+* Wed Mar 9 2016 Orion Poplawski <orion@cora.nwra.com> - 1.2.0-1
+- Update to 1.2.0
+- Use psm/psm2 if possible on EL
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index 9d6496a..8462b6f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-05a175680a2747728e1f255e57052a3c  libfabric-1.1.0.tar.bz2
+e4ccb6b3abc1a9c13e9ad066e6c14dc3  libfabric-1.2.0.tar.bz2