From 138ce75c87cdd0011e15be57bcae406342119e62 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Wed, 15 May 2024 08:59:09 +0000
Subject: [PATCH] Import from AlmaLinux stable repository

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

diff --git a/.gitignore b/.gitignore
index 794491e..dd0f78c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/stratis-cli-3.4.1.tar.gz
+SOURCES/stratis-cli-3.6.0.tar.gz
diff --git a/.stratis-cli.metadata b/.stratis-cli.metadata
index 0e4863e..6ed7b15 100644
--- a/.stratis-cli.metadata
+++ b/.stratis-cli.metadata
@@ -1 +1 @@
-d78a31f93456595aa34c258b92d7e2f5fc26c368 SOURCES/stratis-cli-3.4.1.tar.gz
+ca2d41d023639307671e3286bd377405d08bede7 SOURCES/stratis-cli-3.6.0.tar.gz
diff --git a/SPECS/stratis-cli.spec b/SPECS/stratis-cli.spec
index 3e4125c..b5f3014 100644
--- a/SPECS/stratis-cli.spec
+++ b/SPECS/stratis-cli.spec
@@ -1,21 +1,31 @@
 Name:           stratis-cli
-Version:        3.4.1
+Version:        3.6.0
 Release:        1%{?dist}
 Summary:        Command-line tool for interacting with the Stratis daemon
 
-License:        ASL 2.0
+License:        Apache-2.0
 URL:            https://github.com/stratis-storage/stratis-cli
 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.4.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} && !0%{?eln}
+%if 0%{?rhel}
 ExcludeArch:    i686
 %endif
 BuildArch:      noarch
@@ -65,6 +75,18 @@ 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
+
+* Tue May 16 2023 Bryan Gurney <bgurney@redhat.com> - 3.5.2-1
+- Update to version 3.5.2
+- Resolves: rhbz#2167462
+
 * Mon Jan 09 2023 Bryan Gurney <bgurney@redhat.com> - 3.4.1-1
 - send_uevent: remove strict parameter
 - Resolves: rhbz#2158914