From 587462a28a0edefe22d0acbc5ce282632baa3c2d Mon Sep 17 00:00:00 2001
From: John Baublitz <jbaublitz@redhat.com>
Date: Tue, 18 May 2021 08:34:34 -0400
Subject: [PATCH] Update to patch release and split dracut modules out into
 subpackage

---
 .gitignore    |  2 ++
 sources       |  4 ++--
 stratisd.spec | 36 ++++++++++++++++++++++++++++--------
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 85aa726..a657a5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,5 @@
 /stratisd-2.3.0-vendor.tar.gz
 /stratisd-2.4.0.tar.gz
 /stratisd-2.4.0-vendor.tar.gz
+/stratisd-2.4.1.tar.gz
+/stratisd-2.4.1-vendor.tar.gz
diff --git a/sources b/sources
index 42ac1fd..14f6ac7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (stratisd-2.4.0.tar.gz) = 2ba76d06318967e43e8506dc01a4bb8ae67017f90b96c3d005177d036109e13fad141efd5f8d8be6ce6ed86ad8fa19924be3baf64b213e470ee35220ae70548a
-SHA512 (stratisd-2.4.0-vendor.tar.gz) = 484cc19cabaaf5d33c4ff12b972c6007ec7a4c925eec56ca85d42fc18d8d29ba72ba307923872b7f97a45ec3f6870bf674529b1b778a08a30aa85475fb9c7c3a
+SHA512 (stratisd-2.4.1.tar.gz) = 64b37bba2d488038ba85bc0ac6d8bd750179e7e2b465f5597f1d2f3d95c0a1ca01abf3e794945da0c0dcb7794b3f35e6f5b6f025aaf97071d1486450c5085de0
+SHA512 (stratisd-2.4.1-vendor.tar.gz) = 1fdfc8c5b6589fdbef56893763b96f336bafb7845546b17231bd68e053bb61190c16492cbc5fcf29784deb0b80b4e8d57b797ffcf29dfeefc38f08c557b76e96
diff --git a/stratisd.spec b/stratisd.spec
index 5d725c8..478b87d 100644
--- a/stratisd.spec
+++ b/stratisd.spec
@@ -9,8 +9,8 @@
 %global __cargo_is_lib() false
 
 Name:           stratisd
-Version:        2.4.0
-Release:        4%{?dist}
+Version:        2.4.1
+Release:        1%{?dist}
 Summary:        Daemon that manages block devices to create filesystems
 
 # 0BSD or MIT or ASL 2.0
@@ -47,12 +47,26 @@ BuildRequires:  dracut
 Requires:       xfsprogs
 Requires:       device-mapper-persistent-data
 
-Recommends:     dracut >= 051
 Recommends:     clevis-luks >= 18
 
 %description
 %{summary}.
 
+%package dracut
+Summary: Dracut modules for use with stratisd
+
+ExclusiveArch: ${rust_arches}
+
+Requires:     stratisd
+Requires:     dracut >= 051
+Requires:     plymouth
+
+%description dracut
+
+This package contains dracut modules to be used with stratisd
+to enable using Stratis filesystems as the root filesystem for
+a Linux install.
+
 %prep
 %autosetup -p1
 %if 0%{?rhel} && !0%{?eln}
@@ -138,6 +152,14 @@ install -Dpm0755 -t %{buildroot}%{_systemd_util_dir} systemd/stratis-fstab-setup
 %{udevdir}/stratis-str-cmp
 %{udevdir}/stratis-base32-decode
 %{_bindir}/stratis-predict-usage
+%{_unitdir}/stratisd-min-postinitrd.service
+%{_unitdir}/stratis-fstab-setup@.service
+%{_bindir}/stratis-min
+%{_libexecdir}/stratisd-min
+%{_systemd_util_dir}/stratis-fstab-setup
+
+%files dracut
+%license LICENSE
 %{dracutdir}/dracut.conf.d/90-stratis.conf
 %{dracutdir}/modules.d/90stratis-clevis/module-setup.sh
 %{dracutdir}/modules.d/90stratis-clevis/stratis-clevis-rootfs-setup
@@ -145,15 +167,13 @@ install -Dpm0755 -t %{buildroot}%{_systemd_util_dir} systemd/stratis-fstab-setup
 %{dracutdir}/modules.d/90stratis/module-setup.sh
 %{dracutdir}/modules.d/90stratis/stratis-rootfs-setup
 %{dracutdir}/modules.d/90stratis/stratisd-min.service
-%{_unitdir}/stratisd-min-postinitrd.service
-%{_unitdir}/stratis-fstab-setup@.service
 %{_systemdgeneratordir}/stratis-clevis-setup-generator
 %{_systemdgeneratordir}/stratis-setup-generator
-%{_bindir}/stratis-min
-%{_libexecdir}/stratisd-min
-%{_systemd_util_dir}/stratis-fstab-setup
 
 %changelog
+* Tue May 18 2021 John Baublitz <jbaublitz@redhat.com> - 2.4.1-1
+- Update to new release and split dracut modules out into subpackage
+
 * Thu May 13 2021 John Baublitz <jbaublitz@redhat.com> - 2.4.0-4
 - Ensure that binaries are installed with proper features enabled