From 9e41c67180470407a75aa9fda8fb5745ff227762 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Tue, 6 Jul 2021 11:31:34 -0700 Subject: [PATCH] Consolidate the el8 blocks Gate excludearch to el8 only Signed-off-by: Michel Alexandre Salim --- rust-below.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/rust-below.spec b/rust-below.spec index 286248d..9e9c573 100644 --- a/rust-below.spec +++ b/rust-below.spec @@ -41,10 +41,10 @@ Source5: README-epel.md ExclusiveArch: %{rust_arches} +%if 0%{?el8} # https://bugzilla.redhat.com/show_bug.cgi?id=1978414 ExcludeArch: s390x -%if 0%{?el8} BuildRequires: rust-toolset # for libbpf-sys BuildRequires: kernel-headers @@ -111,6 +111,7 @@ Recommends: logrotate %setup -q -n %{crate}-%{version} %patch1 -p1 %cargo_prep -V 4 +cp -p %{SOURCE5} README-epel.md %else %autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep @@ -122,10 +123,6 @@ cp -p %{SOURCE3} README.md %cargo_generate_buildrequires %endif -%if 0%{?el8} -cp -p %{SOURCE5} README-epel.md -%endif - %build %cargo_build @@ -142,8 +139,9 @@ install -d -m1777 %{buildroot}%{_localstatedir}/log/%{crate} %endif %changelog -* Thu Jul 1 2021 Michel Alexandre Salim - 0.2.0-4 +* Tue Jul 6 2021 Michel Alexandre Salim - 0.2.0-4 - Add README-epel.md with instructions for enabling PSI support +- Gate ExclusiveArch s390x to el8 only * Wed Jun 30 2021 Davide Cavalca - 0.2.0-3 - Add vendored dependencies for EPEL and make it build there