Restore RHEL/Fedora-compatible spec file

Include source files unconditionally in the rpm, regardless of whether they
are used.

Exclude i686 architecture.

.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 @@
-SHA512 (stratisd-2.3.0.tar.gz) = ec16c30394a40c091efbb90a85818a230e93ab615a7f9728cc873d7ca02e16579e7c696bb12295a9778ee6a5e6b95f4cf152853716d7f40985f124e3898977fc
+SHA512 (stratisd-2.3.0-vendor.tar.xz) = 6f1e5749961ca8f8d14b12ed707a8f9c130b511ebc8accdf7792bbbd6d8059beed445d5fb2530b3ce698a6c5f1da02ac0954b1803ab1316b9506cd8cc5a2c332

stratisd.spec

@@ -1,15 +1,13 @@
-# 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
+%global udevdir %(pkg-config --variable=udevdir udev)
 
 Name:           stratisd
 Version:        2.3.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Daemon that manages block devices to create filesystems
 
 # 0BSD or MIT or ASL 2.0
@@ -23,51 +21,69 @@ 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}
+ExcludeArch:    i686
 
+%if 0%{?rhel}
+BuildRequires:  rust-toolset
+%else
 BuildRequires:  rust-packaging
-BuildRequires:  systemd
+%endif
+
+BuildRequires:  systemd-devel
+BuildRequires:  dbus-devel
+BuildRequires:  libblkid-devel
+BuildRequires:  cryptsetup-devel
+BuildRequires:  clang
+BuildRequires:  %{_bindir}/a2x
 
-%{?systemd_requires}
 Requires:       xfsprogs
 Requires:       device-mapper-persistent-data
+Requires:       systemd-libs
+Requires:       dbus-libs
 Requires:       clevis-luks >= 15
 
 %description
 %{summary}.
 
 %prep
+%if 0%{?rhel}
+%setup -q -n %{name}-%{version}
+
+# Source1 is vendored dependencies
+%cargo_prep -V 1
+%else
 %autosetup -p1
 %cargo_prep
-
 %generate_buildrequires
 %cargo_generate_buildrequires
 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
 %cargo_install
-
+%{__install} -Dpm0644 -t %{buildroot}%{_datadir}/dbus-1/system.d stratisd.conf
 # Daemon should be really private
 mkdir -p %{buildroot}%{_libexecdir}
-mv %{buildroot}%{_bindir}/stratisd %{buildroot}%{_libexecdir}/stratisd
-
 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}%{_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} -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
@@ -91,13 +107,15 @@ 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
-%{_udevrulesdir}/11-stratisd.rules
+%config %{_udevrulesdir}/11-stratisd.rules
 
 %changelog
+* 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