From 494044b389a89d43e3789248921882fbcb21b115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= <toke@redhat.com>
Date: Mon, 6 Apr 2020 16:48:27 +0200
Subject: [PATCH] Update to upstream release 0.0.3
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 | 64 +++++++++++++++++++++++++++++++++++++++-----------
 3 files changed, 52 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9dfa479..51fc137 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /xdp-tools-0.0.2.tar.gz
+/xdp-tools-0.0.3.tar.gz
diff --git a/sources b/sources
index eb32b2b..5a6aabd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xdp-tools-0.0.2.tar.gz) = ee6f6d51cc17115fd263c960249b3495f10cf7ea5ac5eff5fc5d20b7575e1d5216a2484a69cf5533e3bb092ad497b1a21391bc31f9131b44636c0d049e79f45f
+SHA512 (xdp-tools-0.0.3.tar.gz) = c2a4278db41af020cf42b1139c93786a49ad2a071b2002177ac39e8d6b74203d251bd7823399d9e156c969d2ae741b0ecd4178edf446fe5c7270e53295458fce
diff --git a/xdp-tools.spec b/xdp-tools.spec
index bb51a75..bf9a4eb 100644
--- a/xdp-tools.spec
+++ b/xdp-tools.spec
@@ -1,6 +1,6 @@
 Name:             xdp-tools
-Version:          0.0.2
-Release:          2%{?dist}
+Version:          0.0.3
+Release:          1%{?dist}
 Summary:          Utilities and example programs for use with XDP
 
 License:          GPLv2
@@ -9,8 +9,10 @@ Source0:          https://github.com/xdp-project/%{name}/releases/download/v%{ve
 
 BuildRequires:    libbpf-devel
 BuildRequires:    elfutils-libelf-devel
-BuildRequires:    clang >= 9.0.0
-BuildRequires:    llvm >= 9.0.0
+BuildRequires:    zlib-devel
+BuildRequires:    libpcap-devel
+BuildRequires:    clang >= 10.0.0
+BuildRequires:    llvm >= 10.0.0
 BuildRequires:    make
 BuildRequires:    gcc
 BuildRequires:    pkgconfig
@@ -19,18 +21,36 @@ BuildRequires:    pkgconfig
 # 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
 
-%package devel
-Summary:          Development files for %{name}
-Requires:         %{name} = %{version}-%{release}
+%package -n libxdp
+Summary:          XDP helper library
 Requires:         kernel-headers
 
-%description devel
-The %{name}-devel package contains libraries header files for
-developing applications that use %{name}
+%package -n libxdp-devel
+Summary:          Development files for libxdp
+Requires:         kernel-headers
+Requires:         libxdp = %{version}-%{release}
+
+%package -n libxdp-static
+Summary:          Static library files for libxdp
+Requires:         kernel-headers
+Requires:         libxdp-devel = %{version}-%{release}
+
+%description -n libxdp
+The libxdp package contains the libxdp library for managing XDP programs,
+used by the %{name} package
+
+%description -n libxdp-devel
+The libxdp-devel package contains headers used for building XDP programs using
+libxdp.
+
+%description -n libxdp-static
+The libxdp-static package contains the static library version of libxdp.
 
 %prep
 %autosetup -p1 -n %{name}-%{version}
@@ -41,6 +61,9 @@ 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
 ./configure
 make %{?_smp_mflags}
 
@@ -52,18 +75,31 @@ export MANDIR='%{_mandir}'
 export HDRDIR='%{_includedir}/xdp'
 make install
 
+# Don't expose libxdp itself in -devel package just yet
+rm -f %{buildroot}%{_includedir}/xdp/libxdp.h
+rm -f %{buildroot}%{_libdir}/libxdp.so
+
 %files
 %{_sbindir}/xdp-filter
+%{_sbindir}/xdp-loader
+%{_sbindir}/xdpdump
 %{_mandir}/man8/*
 %{_libdir}/bpf/*.o
 %license LICENSE
 
-%files devel
-%{_includedir}/xdp/
+%files -n libxdp
+%{_libdir}/libxdp.so.0
+%{_libdir}/libxdp.so.%{version}
+
+%files -n libxdp-static
+%{_libdir}/libxdp.a
+
+%files -n libxdp-devel
+%{_includedir}/xdp/*.h
 
 %changelog
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+* Mon Apr 6 2020 Toke Høiland-Jørgensen <toke@redhat.com> 0.0.3-1
+- Upstream update, add libxdp sub-packages
 
 * Thu Nov 21 2019 Toke Høiland-Jørgensen <toke@redhat.com> 0.0.2-1
 - Upstream update