From 4275751f0dc58ab82fb2e0487bbc54323b3241e4 Mon Sep 17 00:00:00 2001
From: Michal Schmidt <mschmidt@redhat.com>
Date: Mon, 13 Feb 2023 13:35:41 +0100
Subject: [PATCH] Update to upstream release 2.0.6-19

Signed-off-by: Michal Schmidt <mschmidt@redhat.com>
---
 .gitignore |  1 +
 rshim.spec | 14 +++++++++-----
 sources    |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index e9d7318..80bf138 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /rshim-2.0.4.tar.gz
+/rshim-2.0.6-19.tar.gz
diff --git a/rshim.spec b/rshim.spec
index d259cf8..a10c1ac 100644
--- a/rshim.spec
+++ b/rshim.spec
@@ -3,14 +3,15 @@
 #
 
 Name: rshim
-Version: 2.0.4
+# Upstream uses a dash in the version. Not valid in the Version field, so we use a dot instead.
+#   https://github.com/Mellanox/rshim-user-space/issues/105
+%global upstream_ver 2.0.6-19
+Version: %{lua: print((string.gsub(rpm.expand("%{upstream_ver}"),"-",".")))}
 Release: %autorelease
 Summary: User-space driver for Mellanox BlueField SoC
-
 License: GPLv2
-
 URL: https://github.com/mellanox/rshim-user-space
-Source0: https://github.com/Mellanox/rshim-user-space/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
+Source0: https://github.com/Mellanox/rshim-user-space/archive/refs/tags/%{name}-%{upstream_ver}.tar.gz
 
 BuildRequires: gcc, autoconf, automake, make
 BuildRequires: pkgconfig(libpci), pkgconfig(libusb-1.0), pkgconfig(fuse)
@@ -26,7 +27,7 @@ interface. It provides ways to push boot stream, debug the target or login
 via the virtual console or network interface.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n rshim-user-space-%{name}-%{upstream_ver}
 
 %build
 ./bootstrap.sh
@@ -48,9 +49,12 @@ via the virtual console or network interface.
 %files
 %license LICENSE
 %doc README.md
+%config(noreplace) %{_sysconfdir}/rshim.conf
 %{_sbindir}/rshim
+%{_sbindir}/bfb-install
 %{_unitdir}/rshim.service
 %{_mandir}/man8/rshim.8.gz
+%{_mandir}/man8/bfb-install.8.gz
 
 %changelog
 %autochangelog
diff --git a/sources b/sources
index fe6a78a..dbee217 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rshim-2.0.4.tar.gz) = 76b420379bbaf459493e4956a2f8b3e92cf83ebc2cb0ad946c2028383ed5b1093e79a24d0c949776c1e42ce4cb7a1fc474ca35131419efef1484df000018ea18
+SHA512 (rshim-2.0.6-19.tar.gz) = 14cec77f18bc795557c42e47d922f8f1f17481a882bd09eaa85a6f8b90b803dc4b3708f688355da126aa347f0b7965047505bda3819ac98b404d2d87893e25fa