From 4e13b54472b468daa83c7426805529aee2680ecc Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Thu, 7 Jan 2021 21:19:37 +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#9a03daec72d3f131b4c871a81babfd8656408fac
---
 .rust2rpm.conf |  4 ++++
 stratisd.spec  | 22 ++++++++++++++--------
 2 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 .rust2rpm.conf

diff --git a/.rust2rpm.conf b/.rust2rpm.conf
new file mode 100644
index 0000000..cbaaf11
--- /dev/null
+++ b/.rust2rpm.conf
@@ -0,0 +1,4 @@
+[DEFAULT]
+buildrequires =
+  pkgconfig(libcryptsetup) >= 2.3.0
+  pkgconfig(blkid) >= 2.32.0
diff --git a/stratisd.spec b/stratisd.spec
index b901a2e..ee1c9c6 100644
--- a/stratisd.spec
+++ b/stratisd.spec
@@ -9,18 +9,19 @@
 
 Name:           stratisd
 Version:        2.2.1
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Daemon that manages a pool of block devices to create flexible filesystems
 
+# 0BSD or MIT or ASL 2.0
 # ASL 2.0
 # ASL 2.0 or Boost
 # BSD
 # MIT
 # MIT or ASL 2.0
+# MIT or zlib or ASL 2.0
 # MPLv2.0
 # Unlicense or MIT
-# zlib
-License:        MPLv2.0 and ASL 2.0 and BSD and MIT and zlib
+License:        MPLv2.0 and ASL 2.0 and BSD and MIT
 URL:            https://github.com/stratis-storage/stratisd
 Source:         %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 
@@ -28,8 +29,6 @@ ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
 BuildRequires:  systemd
-BuildRequires:  pkgconfig(libcryptsetup) >= 2.3.0
-BuildRequires:  pkgconfig(blkid) >= 2.32.0
 
 %{?systemd_requires}
 Requires:       xfsprogs
@@ -45,6 +44,8 @@ Requires:       device-mapper-persistent-data
 %generate_buildrequires
 %cargo_generate_buildrequires
 echo '/usr/bin/a2x'
+echo 'pkgconfig(libcryptsetup) >= 2.3.0'
+echo 'pkgconfig(blkid) >= 2.32.0'
 
 %build
 %cargo_build
@@ -61,8 +62,6 @@ mv %{buildroot}%{_bindir}/stratisd %{buildroot}%{_libexecdir}/stratisd
 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
@@ -91,12 +90,19 @@ install -Dpm0644 -t %{buildroot}%{_bindir} developer_tools/stratis_migrate_symli
 %{_bindir}/stratis_dbusquery_version
 %{_bindir}/stratis_migrate_symlinks.sh
 %dir %{_datadir}/dbus-1
+%dir %{_datadir}/dbus-1/system.d
 %{_datadir}/dbus-1/system.d/stratisd.conf
 %{_mandir}/man8/stratisd.8*
 %{_unitdir}/stratisd.service
-%config %{_udevrulesdir}/11-stratisd.rules
+%{_udevrulesdir}/11-stratisd.rules
 
 %changelog
+* Mon Dec 28 13:34:26 CET 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 2.2.1-3
+- Rebuild
+
+* Sun Dec 27 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 2.2.1-2
+- Rebuild
+
 * Mon Nov 9 2020 mulhern <amulhern@redhat.com> - 2.2.1-1
 - Update to 2.2.1