From 9d534dd6f61e717449affdf3d5ed2c72044e294f Mon Sep 17 00:00:00 2001
From: Izabela Bakollari <izabela.bakollari@gmail.com>
Date: Wed, 25 May 2022 10:39:17 +0200
Subject: [PATCH] Update to upstream release 4.20.0

---
 .gitignore    |  1 +
 mstflint.spec | 32 +++++++++++++++++---------------
 sources       |  2 +-
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index cd6a0ae..43edf5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@ noarch/
 /mstflint-4.17.0-1.tar.gz
 /mstflint-4.18.0-1.tar.gz
 /mstflint-2b022989e5f22875284f3fbaccf67361ef5a848d.tar.gz
+/mstflint-4.20.0-1.tar.gz
diff --git a/mstflint.spec b/mstflint.spec
index a872372..8751b89 100644
--- a/mstflint.spec
+++ b/mstflint.spec
@@ -1,21 +1,18 @@
 %global __remake_config 1
 
-%global forgeurl https://github.com/Mellanox/mstflint
-%global commit 2b022989e5f22875284f3fbaccf67361ef5a848d
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%forgemeta
-
 Name:		mstflint
 Summary:	Mellanox firmware burning tool
-Version:	4.19.0
-Release:	0.3%{?dist}
+Version:	4.20.0
+Release:	1%{?dist}
 License:	GPLv2+ or BSD
+Url:		https://github.com/Mellanox/%{name}
+Source0: 	https://github.com/Mellanox/%{name}/releases/download/v%{version}-1/%{name}-%{version}-1.tar.gz
 Group:		Applications/System
-Source: 	%{forgesource}
-Patch4: 	add-default-link-flags-for-shared-libraries.patch
+
+Patch4:	add-default-link-flags-for-shared-libraries.patch
 Patch6: 	replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch
-Url:		%{forgeurl}
-BuildRequires: make
+
+BuildRequires:	make
 BuildRequires:	libstdc++-devel, zlib-devel, libibmad-devel, gcc-c++, gcc
 BuildRequires:  libcurl-devel, boost-devel, libxml2-devel, openssl-devel
 %if %{__remake_config}
@@ -30,17 +27,19 @@ This package contains firmware update tool, vpd dump and register dump tools
 for network adapters based on Mellanox Technologies chips.
 
 %prep
-%forgeautosetup -p1
+%setup -q -n %{name}-%{version}
+
+%patch4 -p1
+%patch6 -p1
+
 find . -type f -iname '*.[ch]' -exec chmod a-x '{}' ';'
 find . -type f -iname '*.cpp' -exec chmod a-x '{}' ';'
 
 %build
 %if %{__remake_config}
-# gitversion.sh called from autogen.sh will fail. Just do its work here:
-printf '#define TOOLS_GIT_SHA "%s"\n' %{shortcommit} > common/gitversion.h
 ./autogen.sh
 %endif
-%configure TOOLS_GIT_SHA=%{shortcommit} --enable-fw-mgr
+%configure --enable-fw-mgr
 %make_build
 
 %install
@@ -60,6 +59,9 @@ find %{buildroot} -type f -name '*.a' -delete
 %{_mandir}/man1/*
 
 %changelog
+* Wed May 25 2022 Izabela Bakollari <izabela.bakollari@gmail.com> - 4.20.0-1
+- Update to upstream release 4.20.0
+
 * Mon Mar 28 2022 Michal Schmidt <mschmidt@redhat.com> - 4.19.0-0.3
 - Rebase to the almost released 4.19.0
 
diff --git a/sources b/sources
index 885f591..1e3f7ab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mstflint-2b022989e5f22875284f3fbaccf67361ef5a848d.tar.gz) = f009cb4d78fd98758bcb290163dce01482b3527623a13ac896d8985bb25023e6cfd76568990edf6a1df48bd4431dd7b4bfd3fc6a5abac8597f72ff147e41f86e
+SHA512 (mstflint-4.20.0-1.tar.gz) = 64087c3c1c4fdec15c40e2c0088c5a279df4e845642a203b2cb6a587057327b050492c9f09bbe1243f8b70890e3488b4378f1ea7f736090edfed6969eb6ed7fa