From 629f632c97ab888f2ae3a8bc3eb2bacf0959dd2d Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Jul 15 2022 17:32:46 +0000
Subject: * Fri Jul 15 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.1~rc0-1

- Update to 2.1-rc0
- Drop the hostnqn generate scriptlet (#2065886)

---

diff --git a/.gitignore b/.gitignore
index 6d1a9b5..e00e4ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@
 /nvme-cli-2.0-rc6.tar.gz
 /nvme-cli-2.0-rc8.tar.gz
 /nvme-cli-2.0.tar.gz
+/nvme-cli-2.1-rc0.tar.gz
diff --git a/nvme-cli.spec b/nvme-cli.spec
index 688a6d7..8b46b16 100644
--- a/nvme-cli.spec
+++ b/nvme-cli.spec
@@ -1,9 +1,9 @@
 Name:           nvme-cli
-Version:        2.0
+Version:        2.1~rc0
 Release:        1%{?dist}
 Summary:        NVMe management command line interface
 
-License:        GPLv2+
+License:        GPLv2
 URL:            https://github.com/linux-nvme/nvme-cli
 Source0:        %{url}/archive/v%{version_no_tilde}/%{name}-%{version_no_tilde}.tar.gz
 
@@ -14,7 +14,7 @@ BuildRequires:  systemd-devel
 BuildRequires:  zlib-devel
 BuildRequires:  openssl-devel
 
-BuildRequires:  libnvme-devel >= 1.0
+BuildRequires:  libnvme-devel >= 1.1~rc0
 BuildRequires:  json-c-devel >= 0.14
 BuildRequires:  python3-nose2
 BuildRequires:  python3-mypy
@@ -42,6 +42,8 @@ nvme-cli provides NVM-Express user space tooling for Linux.
 
 # hostid and hostnqn are supposed to be unique per machine.  We obviously
 # can't package them.
+# nvme-stas ships the stas-config@.service that will take care
+# of generating these files if missing. See rhbz 2065886#c19
 rm -f %{buildroot}%{_sysconfdir}/nvme/hostid
 rm -f %{buildroot}%{_sysconfdir}/nvme/hostnqn
 
@@ -73,18 +75,11 @@ rm -rf %{buildroot}%{_pkgdocdir}/nvme
 # /usr/lib/dracut/dracut.conf.d/70-nvmf-autoconnect.conf
 
 
-%post
-if [ $1 -eq 1 ] || [ $1 -eq 2 ]; then
-    if [ ! -s %{_sysconfdir}/nvme/hostnqn ]; then
-        echo $(nvme gen-hostnqn) > %{_sysconfdir}/nvme/hostnqn
-    fi
-    if [ ! -s %{_sysconfdir}/nvme/hostid ]; then
-        uuidgen > %{_sysconfdir}/nvme/hostid
-    fi
-fi
-
-
 %changelog
+* Fri Jul 15 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.1~rc0-1
+- Update to 2.1-rc0
+- Drop the hostnqn generate scriptlet (#2065886)
+
 * Mon Apr 11 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.0-1
 - Update to 2.0
 
diff --git a/sources b/sources
index 2b256e1..b5e8f28 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nvme-cli-2.0.tar.gz) = 24a00ee8e0fc963c1757797413ff5725cec18f821a714d6bbbf37906010d72934d6fdd7b466c085f13716a5279d1a7bd3254ee474e37a0ecd00a85ef23e12417
+SHA512 (nvme-cli-2.1-rc0.tar.gz) = 5d1387435a71d6a95343749f9284552890c81250c158d1efa12977fa17111efaf1b144609622ea81afd1cbb34a051806eedaec45f29a23b32cb39259caf1c0af