From 51f910f288e14e2be2617a83145e5d3e3a2ea02f8a4f80195e650fa7787a0e1b Mon Sep 17 00:00:00 2001
From: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
Date: Tue, 31 Oct 2017 15:35:37 +0000
Subject: [PATCH] Accepting request 537934 from
 home:NMoreyChaisemartin:branches:science:HPC

- Update to v4.8.0-1, No info of changes available (bsc#1046293, fate#322949)
- Update mstflint-gcc7.patch to the latest sources

OBS-URL: https://build.opensuse.org/request/show/537934
OBS-URL: https://build.opensuse.org/package/show/science:HPC/mstflint?expand=0&rev=17
---
 mstflint-4.7.0.tar.gz |  3 ---
 mstflint-4.8.0.tar.gz |  3 +++
 mstflint-gcc7.patch   | 16 ++--------------
 mstflint.changes      |  6 ++++++
 mstflint.spec         |  5 +++--
 5 files changed, 14 insertions(+), 19 deletions(-)
 delete mode 100644 mstflint-4.7.0.tar.gz
 create mode 100644 mstflint-4.8.0.tar.gz

diff --git a/mstflint-4.7.0.tar.gz b/mstflint-4.7.0.tar.gz
deleted file mode 100644
index 19ceb61..0000000
--- a/mstflint-4.7.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f6d1f1c38ef44eda354870a0165b6fd9ae99354cf5ecf13454574d2776cc0420
-size 3543376
diff --git a/mstflint-4.8.0.tar.gz b/mstflint-4.8.0.tar.gz
new file mode 100644
index 0000000..b90b0a1
--- /dev/null
+++ b/mstflint-4.8.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:90e023afe60afdc4a2ca27a48613cd86dee974daae65a428900b998dd23261da
+size 3998365
diff --git a/mstflint-gcc7.patch b/mstflint-gcc7.patch
index 889ed40..ed10427 100644
--- a/mstflint-gcc7.patch
+++ b/mstflint-gcc7.patch
@@ -1,8 +1,8 @@
 diff --git configure.ac configure.ac
-index bc966cd..6265f28 100644
+index 437db76..360a948 100644
 --- configure.ac
 +++ configure.ac
-@@ -121,6 +121,7 @@ AS_IF([test "x$enable_dynamic_ld" = "xyes"], [
+@@ -144,6 +144,7 @@ AS_IF([test "x$enable_dynamic_ld" = "xyes"], [
    LDFLAGS="$LDFLAGS -Wl,--dynamic-linker=/lib64/ld64.so.2"
  ])
  
@@ -10,15 +10,3 @@ index bc966cd..6265f28 100644
  CFLAGS="$CFLAGS -Werror -DMST_UL"
  CXXFLAGS="$CXXFLAGS -Werror -DMST_UL"
  
-diff --git fw_comps_mgr/fw_comps_mgr.cpp fw_comps_mgr/fw_comps_mgr.cpp
-index f4afc0c..ec6dad0 100644
---- fw_comps_mgr/fw_comps_mgr.cpp
-+++ fw_comps_mgr/fw_comps_mgr.cpp
-@@ -804,7 +804,6 @@ void FwCompsMgr::extractRomInfo(tools_open_mgir* mgir, fwInfoT* fwQuery)
- bool FwCompsMgr::queryFwInfo(fwInfoT* query)
- {
-     if (!query) {
--        return FWCOMPS_BAD_PARAM;
-         return false;
-     }
-     memset(query, 0, sizeof(fwInfoT));
diff --git a/mstflint.changes b/mstflint.changes
index 91e91e6..4e44f0d 100644
--- a/mstflint.changes
+++ b/mstflint.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct 31 12:32:47 UTC 2017 - nmoreychaisemartin@suse.com
+
+- Update to v4.8.0-1, No info of changes available (bsc#1046293, fate#322949)
+- Update mstflint-gcc7.patch to the latest sources
+
 -------------------------------------------------------------------
 Wed Aug  9 15:36:35 UTC 2017 - nmoreychaisemartin@suse.com
 
diff --git a/mstflint.spec b/mstflint.spec
index 45733b7..228ba27 100644
--- a/mstflint.spec
+++ b/mstflint.spec
@@ -19,7 +19,7 @@
 %define extra_version -1
 
 Name:           mstflint
-Version:        4.7.0
+Version:        4.8.0
 Release:        0
 Summary:        Mellanox Firmware Burning and Diagnostics Tools
 License:        GPL-2.0 or BSD-2-Clause
@@ -27,7 +27,7 @@ Group:          System/Console
 Url:            http://www.openfabrics.org
 Obsoletes:      mstflint-devel < %{version}
 
-Source:         https://github.com/Mellanox/mstflint/releases/download/v%{version}%{?extra_version}/%{name}-%{version}.tar.gz
+Source:         https://github.com/Mellanox/mstflint/files/1426839/mstflint-%{version}.tar.gz
 # PATCH-FIX-UPSTREAM Build libmtcr as shared library
 Source1:        mstfint-mtcr_ul_no_static_lib.patch
 # PATCH-FIX-UPSTREAM Add all needed defines to get it built on s390x
@@ -81,6 +81,7 @@ rm -rf %{buildroot}%{_bindir}/hca_self_test.ofed
 %doc README COPYING LICENSE
 %{_bindir}/mstconfig
 %{_bindir}/mstflint
+%{_bindir}/mstfwreset
 %{_bindir}/mstmcra
 %{_bindir}/mstmread
 %{_bindir}/mstmtserver