From f0ede10438b21f350eee0050e5e15b2e8a81ccd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= <toke@redhat.com>
Date: Mon, 15 Jun 2020 14:08:34 +0000
Subject: [PATCH] Update to upstream 1.0.0~beta1
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 | 24 +++++++++++++++++-------
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 51fc137..d81ca12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /xdp-tools-0.0.2.tar.gz
 /xdp-tools-0.0.3.tar.gz
+/xdp-tools-1.0.0~beta1.tar.gz
diff --git a/sources b/sources
index 5a6aabd..7c6265a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xdp-tools-0.0.3.tar.gz) = c2a4278db41af020cf42b1139c93786a49ad2a071b2002177ac39e8d6b74203d251bd7823399d9e156c969d2ae741b0ecd4178edf446fe5c7270e53295458fce
+SHA512 (xdp-tools-1.0.0~beta1.tar.gz) = 690f53d09c4ba1037e4bf956973c0388f50f3a298c647e8c0fed9eef6f024c41d5f414a376b8909173f1d70a50d4d428d8afeb20d67a379a132252f42d5615f6
diff --git a/xdp-tools.spec b/xdp-tools.spec
index bf9a4eb..5d0bff6 100644
--- a/xdp-tools.spec
+++ b/xdp-tools.spec
@@ -1,7 +1,8 @@
 Name:             xdp-tools
-Version:          0.0.3
-Release:          1%{?dist}
+Version:          1.0.0~beta1
+Release:          0.1%{?dist}
 Summary:          Utilities and example programs for use with XDP
+%global _soversion 1.0.0
 
 License:          GPLv2
 URL:              https://github.com/xdp-project/%{name}
@@ -16,13 +17,14 @@ BuildRequires:    llvm >= 10.0.0
 BuildRequires:    make
 BuildRequires:    gcc
 BuildRequires:    pkgconfig
+BuildRequires:    m4
+BuildRequires:    emacs-nox
+BuildRequires:    wireshark-cli
 
 # find-debuginfo produces empty debugsourcefiles.list
 # disable the debug package to avoid rpmbuild error'ing out because of this
 %global debug_package %{nil}
 %global _hardened_build 1
-# brp_strip_lto barfs on BPF files, override it as a workaround
-%global __brp_strip_lto %{_bindir}/true
 
 %description
 Utilities and example programs for use with XDP
@@ -72,6 +74,7 @@ export DESTDIR='%{buildroot}'
 export SBINDIR='%{_sbindir}'
 export LIBDIR='%{_libdir}'
 export MANDIR='%{_mandir}'
+export DATADIR='%{_datadir}'
 export HDRDIR='%{_includedir}/xdp'
 make install
 
@@ -84,12 +87,16 @@ rm -f %{buildroot}%{_libdir}/libxdp.so
 %{_sbindir}/xdp-loader
 %{_sbindir}/xdpdump
 %{_mandir}/man8/*
-%{_libdir}/bpf/*.o
+%{_libdir}/bpf/xdpfilt_*.o
+%{_libdir}/bpf/xdpdump_*.o
+%{_datadir}/xdp-tools/
 %license LICENSE
 
 %files -n libxdp
-%{_libdir}/libxdp.so.0
-%{_libdir}/libxdp.so.%{version}
+%{_libdir}/libxdp.so.1
+%{_libdir}/libxdp.so.%{_soversion}
+%{_libdir}/bpf/xdp-dispatcher.o
+%{_libdir}/pkgconfig/libxdp.pc
 
 %files -n libxdp-static
 %{_libdir}/libxdp.a
@@ -98,6 +105,9 @@ rm -f %{buildroot}%{_libdir}/libxdp.so
 %{_includedir}/xdp/*.h
 
 %changelog
+* Mon Jun 15 2020 Toke Høiland-Jørgensen <toke@redhat.com> 1.0.0~beta1-0.1
+- Upstream version bump
+
 * Mon Apr 6 2020 Toke Høiland-Jørgensen <toke@redhat.com> 0.0.3-1
 - Upstream update, add libxdp sub-packages