!4 [sync] PR-3: 合并主包和子包

From: @openeuler-sync-bot 
Reviewed-by: @nlgwcy 
Signed-off-by: @nlgwcy

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 <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
 - Init package