From 896faee72fcb39a2467a75e56da94339a3f91942 Mon Sep 17 00:00:00 2001
From: Bryan Gurney <bgurney@redhat.com>
Date: Tue, 24 Oct 2023 18:05:28 -0400
Subject: [PATCH] Update to 3.6.0

Signed-off-by: Bryan Gurney <bgurney@redhat.com>
---
 .gitignore       |  1 +
 sources          |  2 +-
 stratis-cli.spec | 26 +++++++++++++++++++++-----
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 33bc096..69f7387 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@
 /stratis-cli-3.5.1.tar.gz
 /stratis-cli-3.5.2.tar.gz
 /stratis-cli-3.5.3.tar.gz
+/stratis-cli-3.6.0.tar.gz
diff --git a/sources b/sources
index ef95b5e..9ab4498 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (stratis-cli-3.5.3.tar.gz) = c942e87b5b790a008c79d84a16adf84fd1dd7a09bb9c4d4b4b31e0179acedce92bca74ea31b523fa2276f9c079b81e9beb9021b01d8d9b5b82ddc55ae6ba5dd9
+SHA512 (stratis-cli-3.6.0.tar.gz) = 6bdb94139eea07c130c995a687b7702b667081c7d6ff97ee1a749b1d4fe980e1b523aee182eee59a8dcf2a0664ec7fcf8b44331bc9443a2c2aa8d8bffe2d2eae
diff --git a/stratis-cli.spec b/stratis-cli.spec
index 5f62ce0..7dfb91f 100644
--- a/stratis-cli.spec
+++ b/stratis-cli.spec
@@ -1,6 +1,6 @@
 Name:           stratis-cli
-Version:        3.5.3
-Release:        4%{?dist}
+Version:        3.6.0
+Release:        1%{?dist}
 Summary:        Command-line tool for interacting with the Stratis daemon
 
 License:        Apache-2.0
@@ -10,11 +10,24 @@ Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  %{_bindir}/a2x
-# It runs without, but totally useless
-Requires:       (stratisd >= 3.5.0 with stratisd < 4.0.0)
+%if 0%{?rhel}
+BuildRequires:  python3-dateutil
+BuildRequires:  python3-dbus-client-gen
+BuildRequires:  python3-dbus-python-client-gen
+BuildRequires:  python3-justbytes
+BuildRequires:  python3-packaging
+BuildRequires:  python3-psutil
+BuildRequires:  python3-wcwidth
+%endif
 
-# stratisd only available on certain arches
+# Require the version of stratisd that supports a compatible D-Bus interface
+Requires:       (stratisd >= 3.6.0 with stratisd < 4.0.0)
+
+# Exclude the same arches for stratis-cli as are excluded for stratisd
 ExclusiveArch:  %{rust_arches} noarch
+%if 0%{?rhel}
+ExcludeArch:    i686
+%endif
 BuildArch:      noarch
 
 %description
@@ -62,6 +75,9 @@ a2x -f manpage docs/stratis.txt
 %{python3_sitelib}/stratis_cli-*.egg-info/
 
 %changelog
+* Tue Oct 24 2023 Bryan Gurney <bgurney@redhat.com> - 3.6.0-1
+- Update to 3.6.0
+
 * Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild