From 10ea49f94c494333c4e814bcb162ea8149ed33c3 Mon Sep 17 00:00:00 2001 From: bitcoffee Date: Mon, 11 Dec 2023 13:01:19 +0800 Subject: [PATCH] bpftool:Combine main package and subpackage. Keep consistent with the previous version. ISSUE:#I8O3I7 Signed-off-by: bitcoffee (cherry picked from commit f951fed3d8d963a091594b819e587c137bf33d9a) --- bpftool.spec | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/bpftool.spec b/bpftool.spec index 1775581..30f97b3 100644 --- a/bpftool.spec +++ b/bpftool.spec @@ -1,6 +1,6 @@ Name: bpftool Version: 6.8.0 -Release: 1 +Release: 2 Summary: Tool for inspection and manipulation of BPF programs and maps License: GPL-2.0-only URL: https://www.kernel.org/ @@ -24,15 +24,6 @@ Patch10: bpftool-Fix-bug-for-long-instructions-in-program-CFG.patch bpftool allows for inspection and simple modification of BPF objects (programs and maps) on the system. -%package bash-completion -Summary: Bash completion for bpftool -Requires: %{name} -Requires: bash-completion -Supplements: (%{name} and bash-completion) - -%description bash-completion -bash command line completion support for bpftool. - %prep %autosetup -p1 -n %{name}-%{version} @@ -43,16 +34,19 @@ bash command line completion support for bpftool. %install make -C src V=1 install DESTDIR=%{buildroot} prefix=%{_prefix} mandir=%{_mandir} make -C docs V=1 install DESTDIR=%{buildroot} prefix=%{_prefix} mandir=%{_mandir} +mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d +mv %{buildroot}%{_datadir}/bash-completion/completions/bpftool %{buildroot}%{_sysconfdir}/bash_completion.d/bpftool %files %license LICENSE LICENSE.BSD-2-Clause LICENSE.GPL-2.0 %doc README.md %{_sbindir}/bpftool %{_mandir}/man?/*.gz - -%files bash-completion -%{_datadir}/bash-completion/completions/bpftool +%{_sysconfdir}/bash_completion.d/bpftool %changelog +* Wed Dec 13 2023 liuxin - 6.8.0-2 +- Combine main package and subpackage. Keep consistent with the previous version. + * Tue Nov 21 2023 liuxin - 6.8.0-1 - Init package -- Gitee