rpms/stratisd
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove Fedora ELN conditionals from spec file

Browse Source 
Also, use ExclusiveArch only if RHEL.

Signed-off-by: Bryan Gurney <bgurney@redhat.com>
This commit is contained in:
Bryan Gurney 2023-01-16 13:55:31 -05:00
parent 3e82e097b1
commit 8194531149
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
stratisd.spec
View File

@ -5,7 +5,7 @@
Name: stratisd Name: stratisd
Version: 3.4.4 Version: 3.4.4
Release: 1%{?dist} Release: 2%{?dist}
Summary: Daemon that manages block devices to create filesystems Summary: Daemon that manages block devices to create filesystems
# ASL 2.0 # ASL 2.0
@ -24,12 +24,12 @@ Source1: %{url}/releases/download/v%{version}/%{name}-%{version}-vendor.t
Source2: %{crates_source} Source2: %{crates_source}
%if 0%{?rhel}
ExclusiveArch: %{rust_arches} ExclusiveArch: %{rust_arches}
%if 0%{?rhel} && !0%{?eln}
ExcludeArch: i686 ExcludeArch: i686
%endif %endif
%if 0%{?rhel} && !0%{?eln} %if 0%{?rhel}
BuildRequires: rust-toolset BuildRequires: rust-toolset
%else %else
BuildRequires: rust-packaging BuildRequires: rust-packaging
@ -63,7 +63,9 @@ Recommends: clevis-luks >= 18
%package dracut %package dracut
Summary: Dracut modules for use with stratisd Summary: Dracut modules for use with stratisd
%if 0%{?rhel}
ExclusiveArch: %{rust_arches} ExclusiveArch: %{rust_arches}
%endif
Requires: stratisd Requires: stratisd
Requires: dracut >= 051 Requires: dracut >= 051
@ -76,7 +78,7 @@ Requires: plymouth
%setup -q %setup -q
tar --strip-components=1 --extract --verbose --file %{SOURCE2} tar --strip-components=1 --extract --verbose --file %{SOURCE2}
# Patches must be applied after the upstream package is extracted. # Patches must be applied after the upstream package is extracted.
%if 0%{?rhel} && !0%{?eln} %if 0%{?rhel}
# Source1 is vendored dependencies # Source1 is vendored dependencies
%cargo_prep -V 1 %cargo_prep -V 1
%else %else
@ -86,7 +88,7 @@ tar --strip-components=1 --extract --verbose --file %{SOURCE2}
%endif %endif
%build %build
%if 0%{?rhel} && !0%{?eln} %if 0%{?rhel}
%{cargo_build} --bin=stratisd %{cargo_build} --bin=stratisd
%{cargo_build} --bin=stratis-min --bin=stratisd-min --bin=stratis-utils --no-default-features --features min,systemd_compat %{cargo_build} --bin=stratis-min --bin=stratisd-min --bin=stratis-utils --no-default-features --features min,systemd_compat
%else %else
@ -100,7 +102,7 @@ a2x -f manpage docs/stratisd.txt
%if %{with check} %if %{with check}
%check %check
%if 0%{?rhel} && !0%{?eln} %if 0%{?rhel}
%cargo_test --no-run %cargo_test --no-run
%else %else
%cargo_test -- --no-run %cargo_test -- --no-run
@ -148,6 +150,10 @@ a2x -f manpage docs/stratisd.txt
%{_systemd_util_dir}/system-generators/stratis-setup-generator %{_systemd_util_dir}/system-generators/stratis-setup-generator
%changelog %changelog
* Mon Jan 16 2023 Bryan Gurney <bgurney@redhat.com> - 3.4.4-2
- Remove Fedora ELN conditionals from spec file
- Use ExclusiveArch only if RHEL
* Tue Jan 03 2023 Bryan Gurney <bgurney@redhat.com> - 3.4.4-1 * Tue Jan 03 2023 Bryan Gurney <bgurney@redhat.com> - 3.4.4-1
- Update to 3.4.4 - Update to 3.4.4