Update to upstream 1.0.0~beta2

Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>

.gitignore

@@ -1,3 +1,4 @@
 /xdp-tools-0.0.2.tar.gz
 /xdp-tools-0.0.3.tar.gz
 /xdp-tools-1.0.0~beta1.tar.gz
+/xdp-tools-1.0.0~beta2.tar.gz

sources

@@ -1 +1 @@
-SHA512 (xdp-tools-1.0.0~beta1.tar.gz) = 4ecb72526923f0a262be6f9e45bdd43535e491915ca2928f15534341785ff3537a7d81d5301f2dc2a7f813ce485811f732f01f404149b3ad20b9a6332af357cb
+SHA512 (xdp-tools-1.0.0~beta2.tar.gz) = 6ac219d2392d34a5cbdae27dbfcc4a2a5d52d0b82e2712572aff39a8a9738feda8950bc496a208631c42e1daedb10dabb5c2ce5bce26a104d26d9c7d08cfee7c

xdp-tools.spec

@@ -1,5 +1,5 @@
 Name:             xdp-tools
-Version:          1.0.0~beta1
+Version:          1.0.0~beta2
 Release:          0.1%{?dist}
 Summary:          Utilities and example programs for use with XDP
 %global _soversion 1.0.0
@@ -21,6 +21,9 @@ BuildRequires:    m4
 BuildRequires:    emacs-nox
 BuildRequires:    wireshark-cli
 
+# Always keep xdp-tools and libxdp packages in sync
+Requires:         libxdp = %{version}-%{release}
+
 # find-debuginfo produces empty debugsourcefiles.list
 # disable the debug package to avoid rpmbuild error'ing out because of this
 %global debug_package %{nil}
@@ -62,12 +65,14 @@ The libxdp-static package contains the static library version of libxdp.
 export CFLAGS='%{build_cflags}'
 export LDFLAGS='%{build_ldflags}'
 export LIBDIR='%{_libdir}'
-export PRODUCTION=1
-export DYNAMIC_LIBXDP=1
 export CLANG=%{_bindir}/clang
 export LLC=%{_bindir}/llc
+export PRODUCTION=1
+export DYNAMIC_LIBXDP=1
+export FORCE_SYSTEM_LIBBPF=1
+export FORCE_EMACS=1
 ./configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
 export DESTDIR='%{buildroot}'
@@ -97,6 +102,7 @@ rm -f %{buildroot}%{_libdir}/libxdp.so
 %{_libdir}/libxdp.so.%{_soversion}
 %{_libdir}/bpf/xdp-dispatcher.o
 %{_libdir}/pkgconfig/libxdp.pc
+%{_mandir}/man3/*
 
 %files -n libxdp-static
 %{_libdir}/libxdp.a
@@ -105,6 +111,9 @@ rm -f %{buildroot}%{_libdir}/libxdp.so
 %{_includedir}/xdp/*.h
 
 %changelog
+* Fri Jul 10 2020 Toke Høiland-Jørgensen <toke@redhat.com> 1.0.0~beta2-0.1
+- Upstream version bump
+
 * Mon Jun 15 2020 Toke Høiland-Jørgensen <toke@redhat.com> 1.0.0~beta1-0.1
 - Upstream version bump