From 370456a30aba2f4d476a142af352fdca30b3a457 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 27 Sep 2022 07:01:32 -0400
Subject: [PATCH] import stratis-cli-3.2.0-1.el9

---
 .gitignore                                    |  2 +-
 .stratis-cli.metadata                         |  2 +-
 ...ve-semantic_version-and-wcwidth-deps.patch | 11 -------
 SPECS/stratis-cli.spec                        | 31 ++++++++++++++++---
 4 files changed, 29 insertions(+), 17 deletions(-)
 delete mode 100644 SOURCES/remove-semantic_version-and-wcwidth-deps.patch

diff --git a/.gitignore b/.gitignore
index 2176242..453d1f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/stratis-cli-2.4.3.tar.gz
+SOURCES/stratis-cli-3.2.0.tar.gz
diff --git a/.stratis-cli.metadata b/.stratis-cli.metadata
index 3d19428..8bd26d0 100644
--- a/.stratis-cli.metadata
+++ b/.stratis-cli.metadata
@@ -1 +1 @@
-e2408e519dc9e1e339c5d3ba6f9435cfe55bae84 SOURCES/stratis-cli-2.4.3.tar.gz
+ced5473a45c0652b59f85c06023af3d6689a3053 SOURCES/stratis-cli-3.2.0.tar.gz
diff --git a/SOURCES/remove-semantic_version-and-wcwidth-deps.patch b/SOURCES/remove-semantic_version-and-wcwidth-deps.patch
deleted file mode 100644
index ea09778..0000000
--- a/SOURCES/remove-semantic_version-and-wcwidth-deps.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig	2021-07-19 10:27:56.107557330 -0400
-+++ setup.py	2021-07-19 10:29:17.047557330 -0400
-@@ -50,8 +50,6 @@ setuptools.setup(
-         "dbus-python-client-gen>=0.7",
-         "justbytes>=0.14",
-         "python-dateutil",
--        "semantic_version",
--        "wcwidth",
-     ],
-     package_dir={"": "src"},
-     packages=setuptools.find_packages("src"),
diff --git a/SPECS/stratis-cli.spec b/SPECS/stratis-cli.spec
index e0daf5e..15cd89a 100644
--- a/SPECS/stratis-cli.spec
+++ b/SPECS/stratis-cli.spec
@@ -1,25 +1,29 @@
 Name:           stratis-cli
-Version:        2.4.3
-Release:        2%{?dist}
+Version:        3.2.0
+Release:        1%{?dist}
 Summary:        Command-line tool for interacting with the Stratis daemon
 
 License:        ASL 2.0
 URL:            https://github.com/stratis-storage/stratis-cli
 Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
-Patch0:         remove-semantic_version-and-wcwidth-deps.patch
 
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  %{_bindir}/a2x
 
+%if 0%{?rhel} && !0%{?eln}
 Requires:       platform-python
+%else
+%endif
 
 # It runs without, but totally useless
-Requires:       stratisd >= 2.4
+Requires:       (stratisd >= 3.1.0 with stratisd < 4.0.0)
 
 # stratisd only available on certain arches
 ExclusiveArch:  %{rust_arches} noarch
+%if 0%{?rhel} && !0%{?eln}
 ExcludeArch:    i686
+%endif
 BuildArch:      noarch
 
 %description
@@ -36,10 +40,15 @@ a2x -f manpage docs/stratis.txt
 
 %install
 %py3_install
+# Do not install tab-completion files for RHEL
+%if !0%{?rhel}
 %{__install} -Dpm0644 -t %{buildroot}%{_datadir}/bash-completion/completions \
   shell-completion/bash/stratis
 %{__install} -Dpm0644 -t %{buildroot}%{_datadir}/zsh/site-functions \
   shell-completion/zsh/_stratis
+%{__install} -Dpm0644 -t %{buildroot}%{_datadir}/fish/vendor_completions.d \
+  shell-completion/fish/stratis.fish
+%endif
 %{__install} -Dpm0644 -t %{buildroot}%{_mandir}/man8 docs/stratis.8
 
 %files
@@ -47,16 +56,30 @@ a2x -f manpage docs/stratis.txt
 %doc README.rst
 %{_bindir}/stratis
 %{_mandir}/man8/stratis.8*
+%if !0%{?rhel}
 %dir %{_datadir}/bash-completion
 %dir %{_datadir}/bash-completion/completions
 %{_datadir}/bash-completion/completions/stratis
 %dir %{_datadir}/zsh
 %dir %{_datadir}/zsh/site-functions
 %{_datadir}/zsh/site-functions/_stratis
+%dir %{_datadir}/fish
+%dir %{_datadir}/fish/vendor_completions.d
+%{_datadir}/fish/vendor_completions.d/stratis.fish
+%endif
 %{python3_sitelib}/stratis_cli/
 %{python3_sitelib}/stratis_cli-*.egg-info/
 
 %changelog
+* Fri Jul 08 2022 Bryan Gurney <bgurney@redhat.com> - 3.2.0-1
+- Add the ability to stop and start pools
+- Resolves: rhbz#2105061
+
+* Tue May 31 2022 Bryan Gurney <bgurney@redhat.com> - 3.1.0-1
+- Update to 3.1.0
+- Resolves: rhbz#2039946
+- Revise stratis-cli.spec file to unified format
+
 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.4.3-2
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688