| |
@@ -5,7 +5,7 @@
|
| |
|
| |
Name: %{githubname}
|
| |
Version: %{githubver}
|
| |
- Release: 2%{?dist}
|
| |
+ Release: 3%{?dist}
|
| |
Summary: Libbpf library
|
| |
|
| |
License: LGPLv2 or BSD
|
| |
@@ -51,7 +51,7 @@
|
| |
%autosetup -n %{githubfull}
|
| |
|
| |
%build
|
| |
- %make_build -C ./src %{make_flags}
|
| |
+ %make_build -C ./src %{make_flags} LIBBPF_VERSION=%{version}
|
| |
|
| |
%install
|
| |
%make_install -C ./src %{make_flags}
|
| |
@@ -69,8 +69,11 @@
|
| |
%{_libdir}/libbpf.a
|
| |
|
| |
%changelog
|
| |
- * Tue Feb 08 2022 Jiri Olsa <jolsa@redhat.com> - 2:0.6.1-1
|
| |
- - release 0.6.1-1
|
| |
+ * Thu Feb 10 2022 Michel Alexandre Salim <salimma@fedoraproject.org> - 2:0.6.1-3
|
| |
+ - fix pkgconfig to show the real version, not the incorrect version from src/libbpf.map
|
| |
+
|
| |
+ * Tue Feb 08 2022 Jiri Olsa <jolsa@redhat.com> - 2:0.6.1-2
|
| |
+ - release 0.6.1-2
|
| |
|
| |
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2:0.5.0-2
|
| |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
| |
This upstream commit: https://github.com/libbpf/libbpf/commit/8ade99a6f84d0d7e70965451533b8d76926ee391 stops the libbpf version from being dynamically generated; instead it is sourced from libbpf.map. But libbpf.map only lists 0.x.0 versions - since presumably the ABI is unchanged between patch releases.
Unfortunately this then leaks to the Makefile, which means it leaks to libbpf.pc, which means libbpf-0.6.1 claims to be 0.6.0 and any app depending on 0.6.1 fails to find its dependencies.
Fix by overriding LIBBPF_VERSION when building.
Reported upstream: https://github.com/libbpf/libbpf/issues/455
Also update the changelog, looks like when 0.6.1 was built the release field was not reset back to 1, so the changelog entry was inconsistent.
Signed-off-by: Michel Alexandre Salim salimma@fedoraproject.org