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#58f2d6ee11722ee68e2f1ea24182d96932aa1a46

.gitignore

@@ -19,3 +19,4 @@
 /stratisd-2.2.0.tar.gz
 /stratisd-2.2.1.tar.gz
 /stratisd-2.3.0.tar.gz
+/stratisd-2.3.0-vendor.tar.xz

sources

@@ -1 +1,2 @@
 SHA512 (stratisd-2.3.0.tar.gz) = ec16c30394a40c091efbb90a85818a230e93ab615a7f9728cc873d7ca02e16579e7c696bb12295a9778ee6a5e6b95f4cf152853716d7f40985f124e3898977fc
+SHA512 (stratisd-2.3.0-vendor.tar.xz) = 6f1e5749961ca8f8d14b12ed707a8f9c130b511ebc8accdf7792bbbd6d8059beed445d5fb2530b3ce698a6c5f1da02ac0954b1803ab1316b9506cd8cc5a2c332

stratisd.spec

@@ -9,7 +9,7 @@
 
 Name:           stratisd
 Version:        2.3.0
-Release:        3%{?dist}
+Release:        7%{?dist}
 Summary:        Daemon that manages block devices to create filesystems
 
 # 0BSD or MIT or ASL 2.0
@@ -23,11 +23,22 @@ Summary:        Daemon that manages block devices to create filesystems
 # Unlicense or MIT
 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
+Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
+Source1:        %{name}-%{version}-vendor.tar.xz
 
 ExclusiveArch:  %{rust_arches}
 
+%if 0%{?rhel} && !0%{?eln}
+BuildRequires:  rust-toolset
+BuildRequires:  systemd-devel
+BuildRequires:  dbus-devel
+BuildRequires:  clang
+BuildRequires:  /usr/bin/a2x
+BuildRequires:  pkgconfig(libcryptsetup) >= 2.3.0
+BuildRequires:  pkgconfig(blkid) >= 2.32.0
+%else
 BuildRequires:  rust-packaging
+%endif
 BuildRequires:  systemd
 
 %{?systemd_requires}
@@ -40,6 +51,10 @@ Requires:       clevis-luks >= 15
 
 %prep
 %autosetup -p1
+%if 0%{?rhel} && !0%{?eln}
+# Source1 is vendored dependencies
+%cargo_prep -V 1
+%else
 %cargo_prep
 
 %generate_buildrequires
@@ -47,10 +62,10 @@ Requires:       clevis-luks >= 15
 echo '/usr/bin/a2x'
 echo 'pkgconfig(libcryptsetup) >= 2.3.0'
 echo 'pkgconfig(blkid) >= 2.32.0'
+%endif
 
 %build
 %cargo_build
-%cargo_build -n
 a2x -f manpage docs/stratisd.txt
 
 %install
@@ -67,7 +82,7 @@ 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
+install -Dpm0755 -t %{buildroot}%{_bindir} developer_tools/stratis_migrate_symlinks.sh
 
 %if %{with check}
 %check
@@ -98,6 +113,18 @@ install -Dpm0644 -t %{buildroot}%{_bindir} developer_tools/stratis_migrate_symli
 %{_udevrulesdir}/11-stratisd.rules
 
 %changelog
+* Fri Jan 15 2021 Igor Raits <ignatenkobrain@fedoraproject.org> - 2.3.0-7
+- Fix build on ELN
+
+* Fri Jan 15 2021 Igor Raits <ignatenkobrain@fedoraproject.org> - 2.3.0-6
+- Make package compatible without violating guidelines
+
+* Fri Jan 15 2021 mulhern <amulhern@redhat.com> - 2.3.0-5
+- Add both sources at the same time
+
+* Fri Jan 15 2021 mulhern <amulhern@redhat.com> - 2.3.0-4
+- Restore RHEL/Fedora compatible spec file, adding some additional changes
+
 * Fri Jan 15 2021 Igor Raits <ignatenkobrain@fedoraproject.org> - 2.3.0-3
 - Partially revert previous commit