From 67a6069c289fb49d2c2139c8c6c8c399be547da4 Mon Sep 17 00:00:00 2001
From: Honggang Li <honli@redhat.com>
Date: Thu, 31 Jan 2019 14:32:44 +0800
Subject: [PATCH] Rebase to upstream release v1.7.0

Resolves: bz1671197

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

diff --git a/.gitignore b/.gitignore
index ded817f..8203df8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /fabtests-1.6.0.tar.bz2
 /fabtests-1.6.1.tar.bz2
 /fabtests-1.6.2.tar.bz2
+/fabtests-1.7.0.tar.bz2
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 b76ad14..1bc5d64 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,11 +1,14 @@
-From c97eca499945232f0e6d40b254e64b168261931e Mon Sep 17 00:00:00 2001
-From: Michal Schmidt <mschmidt@redhat.com>
-Date: Tue, 19 Apr 2016 13:29:43 +0200
+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 +-
@@ -22,7 +25,7 @@ index feb6463..2d3b3a3 100755
  # Copyright (c) 2015 Cisco Systems, Inc.  All rights reserved.
  #
 diff --git a/scripts/runfabtests.sh b/scripts/runfabtests.sh
-index decb11a..8cc02f5 100755
+index 813fa53..d084702 100755
 --- a/scripts/runfabtests.sh
 +++ b/scripts/runfabtests.sh
 @@ -1,4 +1,4 @@
@@ -30,7 +33,7 @@ index decb11a..8cc02f5 100755
 +#!/bin/bash
  
  #
- # Copyright (c) 2017, Intel Corporation.  All rights reserved.
+ # Copyright (c) 2017-2018, Intel Corporation.  All rights reserved.
 -- 
-2.17.0
+2.20.1
 
diff --git a/fabtests.spec b/fabtests.spec
index 13ef1d1..1968f4c 100644
--- a/fabtests.spec
+++ b/fabtests.spec
@@ -1,5 +1,5 @@
 Name:           fabtests
-Version:        1.6.2
+Version:        1.7.0
 Release:        1%{?dist}
 Summary:        Test suite for libfabric API
 # include/jsmn.h and common/jsmn.c are licensed under MIT.
@@ -34,11 +34,16 @@ rm -f %{buildroot}%{_libdir}/*.la
 %files
 %{_datadir}/%{name}/
 %{_bindir}/*
+%{_mandir}/man1/*
 %{_mandir}/man7/*
 %doc AUTHORS README
 %license COPYING
 
 %changelog
+* Thu Jan 31 2019 Honggang Li <honli@redhat.com> - 1.7.0-1
+- Rebase to upstream release v1.7.0
+- Resolves: bz1671197
+
 * Tue Oct  9 2018 Honggang Li <honli@redhat.com> - 1.6.2-1
 - Rebase to upstream release v1.6.2
 - Resolves: bz1637336
diff --git a/sources b/sources
index 48d544a..cede616 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fabtests-1.6.2.tar.bz2) = ef4d8cda593a9464e3fbd445ccc10c11190c044d511bf320c861f50a5425cd3c85cba90d3889eef9834df203d112ab7c9c1317131e011cb715faa87ad84cd806
+SHA512 (fabtests-1.7.0.tar.bz2) = 431232cd421c97261f81297e644a44dc889a53337339859bc536902ae90cf4df09adb4441e1c5303acfc8af08bfdb243bc118d1561539fd0e122db33ceb3daca