From 254e99999659a028aaa31be4bdbe9271794df056 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= <toke@redhat.com>
Date: Thu, 2 Feb 2023 19:07:47 +0100
Subject: [PATCH] Update xdp-tools to 1.3.0-1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Upstream version update, fixing compatibility with libbpf-1.0

Resolves: rhbz#2160066

Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
---
 .gitignore     |  1 +
 sources        |  2 +-
 xdp-tools.spec | 17 +++++++++++++++--
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 662df5a..fc42b47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /xdp-tools-1.2.2.tar.gz
 /xdp-tools-1.2.3.tar.gz
 /xdp-tools-1.2.6.tar.gz
+/xdp-tools-1.3.0.tar.gz
diff --git a/sources b/sources
index e09c6cf..564b0c3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xdp-tools-1.2.6.tar.gz) = eed4c9f0e9def0d4915dcc95ff9c731443a986c43cfbfe42abe40704e0ad39bae57319b95f025174b995119cfc6f076be3e956547e599a22504b408bb15245fd
+SHA512 (xdp-tools-1.3.0.tar.gz) = 3f5845c425c6698fb10e80253b39b10e8b8b1eb73ff4615a8e16374de5dc2dc313087ad2b019fe6cbaf3efa041f15c46fb30efe70e23267a89ca1f658c19c528
diff --git a/xdp-tools.spec b/xdp-tools.spec
index 55a9c32..66ff9be 100644
--- a/xdp-tools.spec
+++ b/xdp-tools.spec
@@ -1,8 +1,8 @@
 Name:             xdp-tools
-Version:          1.2.6
+Version:          1.3.0
 Release:          1%{?dist}
 Summary:          Utilities and example programs for use with XDP
-%global _soversion 1.2.0
+%global _soversion 1.3.0
 
 License:          GPLv2
 URL:              https://github.com/xdp-project/%{name}
@@ -20,6 +20,9 @@ BuildRequires:    pkgconfig
 BuildRequires:    m4
 BuildRequires:    emacs-nox
 BuildRequires:    wireshark-cli
+BuildRequires:    bpftool
+
+ExcludeArch:      i386 i686
 
 # Always keep xdp-tools and libxdp packages in sync
 Requires:         libxdp = %{version}-%{release}
@@ -89,6 +92,9 @@ make install V=1
 %{_sbindir}/xdp-filter
 %{_sbindir}/xdp-loader
 %{_sbindir}/xdpdump
+%{_sbindir}/xdp-bench
+%{_sbindir}/xdp-monitor
+%{_sbindir}/xdp-trafficgen
 %{_mandir}/man8/*
 %{_libdir}/bpf/xdpfilt_*.o
 %{_libdir}/bpf/xdpdump_*.o
@@ -112,6 +118,13 @@ make install V=1
 %{_libdir}/pkgconfig/libxdp.pc
 
 %changelog
+* Tue Feb 7 2023 Toke Høiland-Jørgensen <toke@redhat.com> 1.3.0-1
+- Upstream version bump
+- Don't build on i686 (because of missing bpftool)
+
+* Thu Feb 2 2023 Toke Høiland-Jørgensen <toke@redhat.com> 1.2.9-1
+- Upstream version bump
+
 * Tue Aug 16 2022 Toke Høiland-Jørgensen <toke@redhat.com> 1.2.6-1
 - Upstream version bump