From 213d1c04d1f75ff99afb6b4c8d48b2761ff7632d Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Tue, 10 Nov 2020 15:22:39 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/stratisd.git#e487597544f34232e0b78ae20b89dad6bf634296
---
 .gitignore    |  2 ++
 sources       |  2 +-
 stratisd.spec | 27 ++++++++++++++++++++-------
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index b5e5b7f..06114b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,5 @@
 /stratisd-2.0.0.tar.gz
 /stratisd-2.0.1.tar.gz
 /stratisd-2.1.0.tar.gz
+/stratisd-2.2.0.tar.gz
+/stratisd-2.2.1.tar.gz
diff --git a/sources b/sources
index 8f221cb..4bb6d09 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (stratisd-2.1.0.tar.gz) = 59730374aa42d829090e4cb28bef5281a3c0e30fc5250bea472c716d9a7172d5aea3b25588b519d7a657f2dd6f092eb3f4951e12c41328b47ad032564478b5ff
+SHA512 (stratisd-2.2.1.tar.gz) = cb7cca95a9e754672fb446baf8434f35da155fe34a6cacaee731a173d3d8dbd13c4b15afcc3a017ca7d1650668b72e98a266b6991e5af76a177b7ea794997185
diff --git a/stratisd.spec b/stratisd.spec
index 34e05fd..b901a2e 100644
--- a/stratisd.spec
+++ b/stratisd.spec
@@ -1,14 +1,15 @@
 # Generated by rust2rpm
 %bcond_without check
 %global __cargo_skip_build 0
+%global udevdir %(pkg-config --variable=udevdir udev)
 
 # Not interested in packaging lib
 # stratisd is supposed to be daemon used through dbus
 %global __cargo_is_lib() false
 
 Name:           stratisd
-Version:        2.1.0
-Release:        3%{?dist}
+Version:        2.2.1
+Release:        1%{?dist}
 Summary:        Daemon that manages a pool of block devices to create flexible filesystems
 
 # ASL 2.0
@@ -52,18 +53,21 @@ a2x -f manpage docs/stratisd.txt
 
 %install
 %cargo_install
+
 # Daemon should be really private
 mkdir -p %{buildroot}%{_libexecdir}
 mv %{buildroot}%{_bindir}/stratisd %{buildroot}%{_libexecdir}/stratisd
 
-%cargo_install -n
-# Init version should be in sbin
-mkdir -p %{buildroot}%{_sbindir}
-mv %{buildroot}%{_bindir}/stratisd %{buildroot}%{_sbindir}/stratisd-init
+mkdir -p %{buildroot}%{udevdir}
+mv %{buildroot}%{_bindir}/stratis_uuids_to_names %{buildroot}%{udevdir}/stratis_uuids_to_names
+
+mkdir -p %{buildroot}/developer_tools
 
 install -Dpm0644 -t %{buildroot}%{_datadir}/dbus-1/system.d stratisd.conf
 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 -Dpm0644 -t %{buildroot}%{_bindir} developer_tools/stratis_migrate_symlinks.sh
 
 %if %{with check}
 %check
@@ -83,13 +87,22 @@ install -Dpm0644 -t %{buildroot}%{_unitdir} stratisd.service
 %license LICENSE
 %doc README.md
 %{_libexecdir}/stratisd
-%{_sbindir}/stratisd-init
+%{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
+* Mon Nov 9 2020 mulhern <amulhern@redhat.com> - 2.2.1-1
+- Update to 2.2.1
+
+* Mon Oct 19 2020 mulhern <amulhern@redhat.com> - 2.2.0-1
+- Update to 2.2.0
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-3
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild