From ec868ca44039e0ade5e13923a3ef5180ac783a1b Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 18 May 2021 02:57:33 -0400
Subject: [PATCH] import stratisd-2.3.0-2.el8

---
 .gitignore          |  4 ++--
 .stratisd.metadata  |  4 ++--
 SPECS/stratisd.spec | 30 +++++++++++++++++++++++++-----
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index bf8a0e9..4517add 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/stratisd-2.1.0-vendor.tar.xz
-SOURCES/stratisd-2.1.0.tar.gz
+SOURCES/stratisd-2.3.0-vendor.tar.xz
+SOURCES/stratisd-2.3.0.tar.gz
diff --git a/.stratisd.metadata b/.stratisd.metadata
index 13fd343..191a28d 100644
--- a/.stratisd.metadata
+++ b/.stratisd.metadata
@@ -1,2 +1,2 @@
-e23a732ee84b841dba7cddb29d220b4669d4bd83 SOURCES/stratisd-2.1.0-vendor.tar.xz
-11d43fb72502b5386698cdaf1ac67cc06b3db190 SOURCES/stratisd-2.1.0.tar.gz
+7de93a7f69039271c81a8be125a68adec2c5cef7 SOURCES/stratisd-2.3.0-vendor.tar.xz
+cdfbe45e7ce2bbaff2582f6a5db3780c626c00c5 SOURCES/stratisd-2.3.0.tar.gz
diff --git a/SPECS/stratisd.spec b/SPECS/stratisd.spec
index 1404eb6..20ef750 100644
--- a/SPECS/stratisd.spec
+++ b/SPECS/stratisd.spec
@@ -1,12 +1,12 @@
 %bcond_without check
 
-# Not interested in packaging lib
-# stratisd is supposed to be daemon used through dbus
+# A daemon that manages a pool of block devices to create flexible filesystems
 %global __cargo_is_lib() false
+%global udevdir %(pkg-config --variable=udevdir udev)
 
 Name:           stratisd
-Version:        2.1.0
-Release:        1%{?dist}
+Version:        2.3.0
+Release:        2%{?dist}
 Summary:        Daemon that manages block devices to create filesystems
 
 License:        MPLv2.0
@@ -15,6 +15,7 @@ Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 Source1:        %{name}-%{version}-vendor.tar.xz
 
 ExclusiveArch:  %{rust_arches}
+ExcludeArch:    i686
 BuildRequires:  rust-toolset
 BuildRequires:  systemd-devel
 BuildRequires:  dbus-devel
@@ -28,11 +29,11 @@ Requires:       device-mapper-persistent-data
 Requires:       systemd-libs
 Requires:       dbus-libs
 Requires:       cryptsetup >= 2.3.0
+Requires:       clevis-luks >= 15
 
 %description
 %{summary}.
 
-
 %prep
 %setup -q -n %{name}-%{version}
 
@@ -48,9 +49,14 @@ a2x -f manpage docs/stratisd.txt
 %{__install} -Dpm0644 -t %{buildroot}%{_datadir}/dbus-1/system.d stratisd.conf
 # Daemon should be really private
 mkdir -p %{buildroot}%{_libexecdir}
+mkdir -p %{buildroot}%{udevdir}
+mkdir -p %{buildroot}/developer_tools
 mv %{buildroot}%{_bindir}/stratisd %{buildroot}%{_libexecdir}/stratisd
+mv %{buildroot}%{_bindir}/stratis_uuids_to_names %{buildroot}%{udevdir}/stratis_uuids_to_names
 %{__install} -Dpm0644 -t %{buildroot}%{_mandir}/man8 docs/stratisd.8
+%{__install} -Dpm0644 -t %{buildroot}%{_udevrulesdir} udev/11-stratisd.rules
 %{__install} -Dpm0644 -t %{buildroot}%{_unitdir} stratisd.service
+%{__install} -Dpm0755 -t %{buildroot}%{_bindir} developer_tools/stratis_migrate_symlinks.sh
 
 %if %{with check}
 %check
@@ -70,12 +76,26 @@ mv %{buildroot}%{_bindir}/stratisd %{buildroot}%{_libexecdir}/stratisd
 %license LICENSE
 %doc README.md
 %{_libexecdir}/stratisd
+%{udevdir}/stratis_uuids_to_names
+%{_bindir}/stratis_dbusquery_version
+%{_bindir}/stratis_migrate_symlinks.sh
 %dir %{_datadir}/dbus-1
 %{_datadir}/dbus-1/system.d/stratisd.conf
 %{_mandir}/man8/stratisd.8*
 %{_unitdir}/stratisd.service
+%config %{_udevrulesdir}/11-stratisd.rules
 
 %changelog
+* Tue Dec 08 2020  Dennis Keefe <dkeefe@redhat.com> - 2.3.0-2
+- Update to 2.3.0
+- Resolves: rhbz#1885328
+- Stratis devices inhabit an existing root directory path
+- Resolves: rhbz#1798244
+- Add Clevis Support
+- Resolves: rhbz#1868100
+- Improve stratisd log levels
+- Resolves: rhbz#1757976
+ 
 * Sat Jun 06 2020  Dennis Keefe <dkeefe@redhat.com> - 2.1.0-1
 - Update to 2.1.0
 - Resolves: rhbz#1791473