bpftool:Combine main package and subpackage. Keep consistent with the previous version.

ISSUE:#I8O3I7

Signed-off-by: bitcoffee <liuxin350@huawei.com>
(cherry picked from commit f951fed3d8d963a091594b819e587c137bf33d9a)
This commit is contained in:
bitcoffee 2023-12-11 13:01:19 +08:00 committed by openeuler-sync-bot
parent 4c4f1d6b52
commit 8fcda2e1b2

View File

@ -1,6 +1,6 @@
Name: bpftool Name: bpftool
Version: 6.8.0 Version: 6.8.0
Release: 1 Release: 2
Summary: Tool for inspection and manipulation of BPF programs and maps Summary: Tool for inspection and manipulation of BPF programs and maps
License: GPL-2.0-only License: GPL-2.0-only
URL: https://www.kernel.org/ 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 bpftool allows for inspection and simple modification of BPF objects (programs
and maps) on the system. 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 %prep
%autosetup -p1 -n %{name}-%{version} %autosetup -p1 -n %{name}-%{version}
@ -43,16 +34,19 @@ bash command line completion support for bpftool.
%install %install
make -C src V=1 install DESTDIR=%{buildroot} prefix=%{_prefix} mandir=%{_mandir} make -C src V=1 install DESTDIR=%{buildroot} prefix=%{_prefix} mandir=%{_mandir}
make -C docs 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 %files
%license LICENSE LICENSE.BSD-2-Clause LICENSE.GPL-2.0 %license LICENSE LICENSE.BSD-2-Clause LICENSE.GPL-2.0
%doc README.md %doc README.md
%{_sbindir}/bpftool %{_sbindir}/bpftool
%{_mandir}/man?/*.gz %{_mandir}/man?/*.gz
%{_sysconfdir}/bash_completion.d/bpftool
%files bash-completion
%{_datadir}/bash-completion/completions/bpftool
%changelog %changelog
* Wed Dec 13 2023 liuxin <liuxin350@huawei.com> - 6.8.0-2
- Combine main package and subpackage. Keep consistent with the previous version.
* Tue Nov 21 2023 liuxin <liuxin350@huawei.com> - 6.8.0-1 * Tue Nov 21 2023 liuxin <liuxin350@huawei.com> - 6.8.0-1
- Init package - Init package