From fa521fe90e23fd476f6e2b41e5a80a36d8baf95f Mon Sep 17 00:00:00 2001
From: Honggang Li <honli@redhat.com>
Date: Sat, 29 Jun 2019 09:19:51 -0400
Subject: [PATCH] Rebase to upstream release v1.8.0

Signed-off-by: Honggang Li <honli@redhat.com>
---
 .gitignore                                    |  1 +
 ...ines-in-rft_yaml_to_junit_xml-and-ru.patch | 37 +++++--------------
 fabtests.spec                                 |  9 +++--
 sources                                       |  2 +-
 4 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5d53058..3c72d4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /fabtests-1.6.2.tar.bz2
 /fabtests-1.7.0.tar.bz2
 /fabtests-1.7.1.tar.bz2
+/fabtests-1.8.0.tar.gz
diff --git a/0001-adjust-shebang-lines-in-rft_yaml_to_junit_xml-and-ru.patch b/0001-adjust-shebang-lines-in-rft_yaml_to_junit_xml-and-ru.patch
index 1bc5d64..2b1ee01 100644
--- a/0001-adjust-shebang-lines-in-rft_yaml_to_junit_xml-and-ru.patch
+++ b/0001-adjust-shebang-lines-in-rft_yaml_to_junit_xml-and-ru.patch
@@ -1,39 +1,20 @@
-From 7b682088080f5f51ae53313dedfd81f4bc670fb3 Mon Sep 17 00:00:00 2001
-From: Honggang Li <honli@redhat.com>
-Date: Thu, 31 Jan 2019 14:15:20 +0800
-Subject: [PATCH] adjust shebang lines in rft_yaml_to_junit_xml and
- runfabtests.sh
-
-Do not use /usr/bin/env. Call the appropriate binary directly.
-This way rpmbuild will record the right dependencies.
-
-Signed-off-by: Michal Schmidt <mschmidt@redhat.com>
-Signed-off-by: Honggang Li <honli@redhat.com>
----
- scripts/rft_yaml_to_junit_xml | 2 +-
- scripts/runfabtests.sh        | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/scripts/rft_yaml_to_junit_xml b/scripts/rft_yaml_to_junit_xml
-index feb6463..2d3b3a3 100755
---- a/scripts/rft_yaml_to_junit_xml
-+++ b/scripts/rft_yaml_to_junit_xml
+diff --git a/fabtests/scripts/rft_yaml_to_junit_xml b/fabtests/scripts/rft_yaml_to_junit_xml
+index feb646366..2d3b3a30c 100755
+--- a/fabtests/scripts/rft_yaml_to_junit_xml
++++ b/fabtests/scripts/rft_yaml_to_junit_xml
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env ruby
 +#!/usr/bin/ruby
  
  # Copyright (c) 2015 Cisco Systems, Inc.  All rights reserved.
  #
-diff --git a/scripts/runfabtests.sh b/scripts/runfabtests.sh
-index 813fa53..d084702 100755
---- a/scripts/runfabtests.sh
-+++ b/scripts/runfabtests.sh
+diff --git a/fabtests/scripts/runfabtests.sh b/fabtests/scripts/runfabtests.sh
+index aba23be6f..73f55d07b 100755
+--- a/fabtests/scripts/runfabtests.sh
++++ b/fabtests/scripts/runfabtests.sh
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/bash
  
  #
- # Copyright (c) 2017-2018, Intel Corporation.  All rights reserved.
--- 
-2.20.1
-
+ # Copyright (c) 2017-2019, Intel Corporation.  All rights reserved.
diff --git a/fabtests.spec b/fabtests.spec
index 1ae0662..69cf25d 100644
--- a/fabtests.spec
+++ b/fabtests.spec
@@ -1,5 +1,5 @@
 Name:           fabtests
-Version:        1.7.1
+Version:        1.8.0
 Release:        1%{?dist}
 Summary:        Test suite for libfabric API
 # include/jsmn.h and common/jsmn.c are licensed under MIT.
@@ -8,7 +8,7 @@ Summary:        Test suite for libfabric API
 # See the license headers in individual source files to see which those are.
 License:        BSD and (BSD or GPLv2) and MIT
 Url:            https://github.com/ofiwg/fabtests
-Source:         https://github.com/ofiwg/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2
+Source:         https://github.com/ofiwg/libfabric/releases/download/v%{version}/%{name}-%{version}.tar.gz
 Patch0:         0001-adjust-shebang-lines-in-rft_yaml_to_junit_xml-and-ru.patch
 BuildRequires:  libfabric-devel >= %{version}
 BuildRequires:  valgrind-devel
@@ -20,7 +20,7 @@ fabric software library.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p2
 
 %build
 %configure --with-valgrind
@@ -40,6 +40,9 @@ rm -f %{buildroot}%{_libdir}/*.la
 %license COPYING
 
 %changelog
+* Sat Jun 29 2019 Honggang Li <honli@redhat.com> - 1.8.0-1
+- Rebase to upstream release v1.8.0
+
 * Mon Apr 15 2019 Honggang Li <honli@redhat.com> - 1.7.1-1
 - Rebase to upstream release v1.7.1
 
diff --git a/sources b/sources
index 7e322ae..32c55b4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fabtests-1.7.1.tar.bz2) = 7fea437ada2002c8fa09bcbcbb3fa330f0f2c3caac5044a23451201fcef627e1c5e8a360b1a133d3744d932a1ead7c1b69d1c3c30dfae0e73be9507ba93cf784
+SHA512 (fabtests-1.8.0.tar.gz) = fa739071ec5ddc449d5a501e1dd646934affc42998977d3fac76c01d2c7e976b08cb9c3d62870f9a52a54733ecb7e9311b612856c53f460eafff531a8c7cf8e7