Synchronize spec with upstream unified spec file

Also, remove an obsolete .rust2rpm.conf file.

Signed-off-by: Bryan Gurney <bgurney@redhat.com>

.rust2rpm.conf

@@ -1,4 +0,0 @@
-[DEFAULT]
-buildrequires =
-  pkgconfig(libcryptsetup) >= 2.3.0
-  pkgconfig(blkid) >= 2.32.0

stratisd.spec

@@ -1,10 +1,11 @@
 %bcond_without check
+
 %global udevdir %(pkg-config --variable=udevdir udev)
 %global dracutdir %(pkg-config --variable=dracutdir dracut)
 
 Name:           stratisd
 Version:        3.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Daemon that manages block devices to create filesystems
 
 # ASL 2.0
@@ -20,9 +21,13 @@ License:        MPLv2.0 and ASL 2.0 and BSD and MIT
 URL:            https://github.com/stratis-storage/stratisd
 Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 Source1:        %{url}/releases/download/v%{version}/%{name}-%{version}-vendor.tar.gz
-Source2:	%{crates_source}
+Source2:        %{crates_source}
+
 
 ExclusiveArch:  %{rust_arches}
+%if 0%{?rhel} && !0%{?eln}
+ExcludeArch:    i686
+%endif
 
 %if 0%{?rhel} && !0%{?eln}
 BuildRequires:  rust-toolset
@@ -128,6 +133,7 @@ a2x -f manpage docs/stratisd.txt
 %{_libexecdir}/stratisd-min
 %{_systemd_util_dir}/stratis-fstab-setup
 
+
 %files dracut
 %license LICENSE
 %{dracutdir}/modules.d/90stratis-clevis/module-setup.sh
@@ -140,6 +146,10 @@ a2x -f manpage docs/stratisd.txt
 %{_systemd_util_dir}/system-generators/stratis-setup-generator
 
 %changelog
+* Fri Jun 03 2022 Bryan Gurney <bgurney@redhat.com> - 3.1.0-2
+- Synchronize spec with upstream unified spec file
+- Remove .rust2rpm.conf file
+
 * Wed May 25 2022 mulhern <amulhern@redhat.com> - 3.1.0-1
 - Update to 3.1.0