Skip to content

Commit 8c45806

Browse files
committed
Reverse failed attempt to include static DPDK in libtrace4 rpm
1 parent 89d1210 commit 8c45806

1 file changed

Lines changed: 7 additions & 8 deletions

File tree

rpm/libtrace4.spec

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
11
Name: libtrace4
22
Version: 4.0.32
3-
Release: 1%{?rhel_release}
3+
Release: 2%{?rhel_release}
44
Summary: C Library for capturing and analysing network packets
55

66
License: LGPLv3
77
URL: https://github.com/LibtraceTeam/libtrace
88
Source0: https://github.com/LibtraceTeam/libtrace/archive/%{version}.tar.gz
99

10-
%define dpdk_version %(pkg-config --modversion libdpdk 2>/dev/null || echo "unknown")
11-
%define dpdk_major %(echo %{dpdk_version} | cut -d. -f1-2)
12-
13-
%global __requires_exclude ^librte_.*$
14-
Provides: bundled(dpdk) = %{dpdk_major}
15-
1610
BuildRequires: gcc
1711
BuildRequires: gcc-c++
1812
BuildRequires: make
@@ -28,6 +22,7 @@ BuildRequires: libwandder2-devel >= 2.0.14
2822
BuildRequires: libwandio1-devel
2923
BuildRequires: dpdk-devel
3024
BuildRequires: (flex-devel or libfl-static)
25+
Requires: dpdk
3126

3227
Provides: libtrace4
3328

@@ -42,10 +37,11 @@ University in New Zealand.
4237
%package devel
4338
Summary: Development files for %{name}
4439
Requires: %{name}%{?_isa} = %{version}-%{release}
40+
Requires: dpdk-devel
4541

4642
%package tools
4743
Summary: Helper utilities for use with the %{name} library
48-
Requires: %{name}%{?_isa} = %{version}-%{release}, libpacketdump4%{?_isa} = %{version}-%{release}
44+
Requires: %{name}%{?_isa} = %{version}-%{release}, libpacketdump4%{?_isa} = %{version}-%{release}, dpdk
4945

5046
%package -n libpacketdump4
5147
Summary: Network packet parsing and human-readable display library
@@ -132,6 +128,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
132128

133129

134130
%changelog
131+
* Wed Jun 3 2026 Shane Alcock <shane@alcock.co.nz> - 4.0.32-2
132+
- Fix broken DPDK dependency
133+
135134
* Thu May 28 2026 Shane Alcock <shane@alcock.co.nz> - 4.0.32-1
136135
- Updated for 4.0.32 release
137136

0 commit comments

Comments
 (0)