From 6db0ee8a76b3841bd7d36e8171c0cd3bcdcc392c Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Thu, 28 Mar 2024 11:52:16 +0000
Subject: [PATCH] import CS stratis-cli-3.6.0-1.el9

---
 .gitignore             |  2 +-
 .stratis-cli.metadata  |  2 +-
 SPECS/stratis-cli.spec | 19 +++++++++++++------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 70778b5..dd0f78c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/stratis-cli-3.5.3.tar.gz
+SOURCES/stratis-cli-3.6.0.tar.gz
diff --git a/.stratis-cli.metadata b/.stratis-cli.metadata
index 776a2ea..6ed7b15 100644
--- a/.stratis-cli.metadata
+++ b/.stratis-cli.metadata
@@ -1 +1 @@
-cc4398d6bc136430a97b1d4fdf3eb7261fd923f3 SOURCES/stratis-cli-3.5.3.tar.gz
+ca2d41d023639307671e3286bd377405d08bede7 SOURCES/stratis-cli-3.6.0.tar.gz
diff --git a/SPECS/stratis-cli.spec b/SPECS/stratis-cli.spec
index 959c15b..b5f3014 100644
--- a/SPECS/stratis-cli.spec
+++ b/SPECS/stratis-cli.spec
@@ -1,5 +1,5 @@
 Name:           stratis-cli
-Version:        3.5.3
+Version:        3.6.0
 Release:        1%{?dist}
 Summary:        Command-line tool for interacting with the Stratis daemon
 
@@ -9,6 +9,8 @@ Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
+BuildRequires:  %{_bindir}/a2x
+%if 0%{?rhel}
 BuildRequires:  python3-dateutil
 BuildRequires:  python3-dbus-client-gen
 BuildRequires:  python3-dbus-python-client-gen
@@ -16,13 +18,14 @@ BuildRequires:  python3-justbytes
 BuildRequires:  python3-packaging
 BuildRequires:  python3-psutil
 BuildRequires:  python3-wcwidth
-BuildRequires:  %{_bindir}/a2x
-# It runs without, but totally useless
-Requires:       (stratisd >= 3.5.0 with stratisd < 4.0.0)
+%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} && !0%{?eln}
+%if 0%{?rhel}
 ExcludeArch:    i686
 %endif
 BuildArch:      noarch
@@ -72,6 +75,10 @@ a2x -f manpage docs/stratis.txt
 %{python3_sitelib}/stratis_cli-*.egg-info/
 
 %changelog
+* Mon Nov 06 2023 Bryan Gurney <bgurney@redhat.com> - 3.6.0-1
+- Update to version 3.6.0
+- Resolves: RHEL-2265
+
 * Thu Jun 08 2023 Bryan Gurney <bgurney@redhat.com> - 3.5.3-1
 - Allow for inconsistent value in StoppedPools D-Bus property
 - Resolves: rhbz#2213325