From 57f18e28d50f62beb5cf6d525d330e2ebdc5ec9e Mon Sep 17 00:00:00 2001
From: Honggang Li <honli@redhat.com>
Date: Sun, 12 Apr 2020 23:09:57 -0400
Subject: [PATCH] Update to upstream release 1.10.0rc2

Signed-off-by: Honggang Li <honli@redhat.com>
---
 .gitignore     |  1 +
 libfabric.spec | 14 ++++++++------
 sources        |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 50b576d..7891eeb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /libfabric-1.9.1rc1.tar.bz2
 /libfabric-1.9.1.tar.bz2
 /libfabric-1.10.0rc1.tar.bz2
+/libfabric-1.10.0rc2.tar.bz2
diff --git a/libfabric.spec b/libfabric.spec
index 19ec4c0..cf366be 100644
--- a/libfabric.spec
+++ b/libfabric.spec
@@ -1,15 +1,12 @@
-%global __remake_config 1
+%global __remake_config 0
 
 Name:           libfabric
-Version:        1.10.0rc1
+Version:        1.10.0rc2
 Release:        1%{?dist}
 Summary:        Open Fabric Interfaces
 
 License:        BSD or GPLv2
-URL:            http://ofiwg.github.io/libfabric/
-# upstream release libfabric-1.10.0rc1.tar.bz2 is broken. I had to
-# create the tar ball with command:
-# git archive --format=tar --prefix=libfabric-1.10.0rc1/ 7fd1a9a29 | bzip2 > libfabric-1.10.0rc1.tar.bz2
+URL:            https://github.com/ofiwg/libfabric
 Source0:        https://github.com/ofiwg/libfabric/releases/download/v%{version}/libfabric-%{version}.tar.bz2
 
 %if %{__remake_config}
@@ -25,7 +22,9 @@ BuildRequires:  libibverbs-devel
 BuildRequires:  librdmacm-devel
 %endif
 %ifarch x86_64
+%if 0%{?fedora} || 0%{?rhel} == 7
 BuildRequires:  infinipath-psm-devel
+%endif
 %if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires:  libpsm2-devel
 %endif
@@ -93,6 +92,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 
 %changelog
+* Sun Apr 12 2020 Honggang Li <honli@redhat.com> - 1.10.0rc2-1
+- Update to 1.10.0rc2
+
 * Fri Apr 03 2020 Honggang Li <honli@redhat.com> - 1.10.0rc1-1
 - Update to 1.10.0rc1
 - Resolves: bz1820096
diff --git a/sources b/sources
index e2cea41..21d5165 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libfabric-1.10.0rc1.tar.bz2) = 0ef228fe836189df497db391fcad09019a2b762c98b1e19d6f20e7764b6e325f8e89962f52eca37493fea89c34e682076292809f738c8d4923192004fb0ed417
+SHA512 (libfabric-1.10.0rc2.tar.bz2) = 009895d8ddd54b990926203cac0f43219f0df35dd2cb2d95a39a407cedf085919b6ef0ea3aeff0d42f72e8038ae5d680f27a9a4611b9ba8360f854c0fd124912