From c5bc95bffc0a40ff87aadc82d0be17fb91a094cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= <toke@redhat.com>
Date: Mon, 8 Aug 2022 18:27:12 +0200
Subject: [PATCH] Update to upstream v1.2.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/.gitignore b/.gitignore
index ec84812..f9ec3b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /xdp-tools-1.2.0.tar.gz
 /xdp-tools-1.2.2.tar.gz
 /xdp-tools-1.2.3.tar.gz
+/xdp-tools-1.2.5.tar.gz
diff --git a/sources b/sources
index 2c99443..d32bc91 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xdp-tools-1.2.3.tar.gz) = dd19f03fdb5377f1bf986e742723fdfa8aa59983f60d6715b751e0cbd7cd8b0603acec09b336abcbd14f72d4707ce8f8fcbb4b1621ff4e693110b486147447ee
+SHA512 (xdp-tools-1.2.5.tar.gz) = ef1e6612ebb06f19e1e5eebea9575495c295920be8940089d716171ff6d199d3642fb3933888a11709d0d22a356caa4575f6e2f9c82b1fd7de0914ed70cf0a74
diff --git a/xdp-tools.spec b/xdp-tools.spec
index e3cff1e..e04b007 100644
--- a/xdp-tools.spec
+++ b/xdp-tools.spec
@@ -1,6 +1,6 @@
 Name:             xdp-tools
-Version:          1.2.3
-Release:          2%{?dist}
+Version:          1.2.5
+Release:          1%{?dist}
 Summary:          Utilities and example programs for use with XDP
 %global _soversion 1.2.0
 
@@ -65,6 +65,7 @@ The libxdp-static package contains the static library version of libxdp.
 export CFLAGS='%{build_cflags}'
 export LDFLAGS='%{build_ldflags}'
 export LIBDIR='%{_libdir}'
+export RUNDIR='%{_rundir}'
 export CLANG=%{_bindir}/clang
 export LLC=%{_bindir}/llc
 export PRODUCTION=1
@@ -78,6 +79,7 @@ make %{?_smp_mflags} V=1
 export DESTDIR='%{buildroot}'
 export SBINDIR='%{_sbindir}'
 export LIBDIR='%{_libdir}'
+export RUNDIR='%{_rundir}'
 export MANDIR='%{_mandir}'
 export DATADIR='%{_datadir}'
 export HDRDIR='%{_includedir}/xdp'
@@ -90,7 +92,6 @@ make install V=1
 %{_mandir}/man8/*
 %{_libdir}/bpf/xdpfilt_*.o
 %{_libdir}/bpf/xdpdump_*.o
-%{_libdir}/bpf/xsk_def_xdp_prog*.o
 %{_datadir}/xdp-tools/
 %license LICENSES/*
 
@@ -98,7 +99,9 @@ make install V=1
 %{_libdir}/libxdp.so.1
 %{_libdir}/libxdp.so.%{_soversion}
 %{_libdir}/bpf/xdp-dispatcher.o
+%{_libdir}/bpf/xsk_def_xdp_prog*.o
 %{_mandir}/man3/*
+%license LICENSES/*
 
 %files -n libxdp-static
 %{_libdir}/libxdp.a
@@ -109,6 +112,9 @@ make install V=1
 %{_libdir}/pkgconfig/libxdp.pc
 
 %changelog
+* Mon Aug 8 2022 Toke Høiland-Jørgensen <toke@redhat.com> 1.2.5-1
+- Upstream version bump
+
 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild