AlmaLinux changes: Bring i686 back

bpftool.spec

@@ -10,7 +10,7 @@
 
 Name:           bpftool
 Version:        7.7.0
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Inspection and simple manipulation of eBPF programs and maps
 
 %global libname libbpf
@@ -19,8 +19,6 @@ Summary:        Inspection and simple manipulation of eBPF programs and maps
 License:        GPL-2.0-only OR BSD-2-Clause
 Source:         %{source}.tar.xz
 
-ExcludeArch:    %{ix86}
-
 BuildRequires:  gcc
 BuildRequires:  make
 BuildRequires:  binutils-devel
@@ -42,7 +40,7 @@ manipulation of eBPF programs and maps.
 # We need to use vmlinux.h from kernel-devel rather than the one from the running system
 %define kernel_version %(rpm -q --qf "%%{VERSION}-%%{RELEASE}.%%{ARCH}" kernel-devel)
 pushd tools/bpf/bpftool
-%make_build EXTRA_CFLAGS="%{build_cflags}" EXTRA_CXXFLAGS="%{build_cflags}" EXTRA_LDFLAGS="%{build_ldflags}" VMLINUX_H="/usr/src/kernels/%{kernel_version}/vmlinux.h"
+%make_build EXTRA_CFLAGS="%{build_cflags}" EXTRA_LDFLAGS="%{build_ldflags}" VMLINUX_H="/usr/src/kernels/%{kernel_version}/vmlinux.h"
 
 %install
 pushd tools/bpf/bpftool