Restore back influx-cli-bash-completion subpackage and remove it from bash-completion (#12914)

Author: mbykhovtsev-ms

SPECS/bash-completion/bash-completion.spec

@@ -1,6 +1,6 @@
 Name:          bash-completion
 Version:       2.11
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Programmable completion for bash
 Group:         Applications/Shells
 Vendor:        Microsoft Corporation
@@ -51,6 +51,9 @@ rm -f %{buildroot}%{_datadir}/bash-completion/completions/nmcli
 rm -f %{buildroot}%{_datadir}/bash-completion/completions/\
 {cal,chsh,dmesg,eject,hexdump,ionice,hwclock,ionice,look,mount,renice,rtcwake,su,umount}
 
+# does not work anymore with new versions of influx and provided by influx-cli-bash-completion
+rm -f %{buildroot}%{_datadir}/bash-completion/completions/influx
+
 %files
 %defattr(-,root,root)
 %license COPYING
@@ -60,7 +63,7 @@ rm -f %{buildroot}%{_datadir}/bash-completion/completions/\
 %dir %{_datadir}/bash-completion/helpers
 %{_datadir}/bash-completion/helpers/perl
 %{_datadir}/bash-completion/helpers/python
-%doc AUTHORS COPYING
+%doc AUTHORS
 
 %files devel
 %defattr(-,root,root)
@@ -69,13 +72,17 @@ rm -f %{buildroot}%{_datadir}/bash-completion/completions/\
 %{_datadir}/pkgconfig/bash-completion.pc
 
 %changelog
+* Wed Mar 12 2025 Mykhailo Bykhovtsev <mbykhovtsev@microsoft.com> - 2.11-2
+- Remove influx bash completion file as it no longer works and is provided by influx-cli-bash-completion package.
+- Removed duplicated license file
+
 * Mon Jan 10 2022 Nicolas Guibourge <nicolasg@microsoft.com> - 2.11-1
 - Upgrade to 2.11.
 
 * Thu Dec 16 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.7-5
 - Removing the explicit %%clean stage.
 
-* Wed Oct 27 2021 Muhammad Falak <mwani@microsft.com> - 2.7-4
+* Wed Oct 27 2021 Muhammad Falak <mwani@microsoft.com> - 2.7-4
 - Remove epoch
 
 * Mon Mar 08 2021 Thomas Crain <thcrain@microsoft.com> - 2.7-3

SPECS/influx-cli/influx-cli.spec

@@ -18,7 +18,7 @@
 Summary:        CLI for managing resources in InfluxDB
 Name:           influx-cli
 Version:        2.7.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -46,6 +46,17 @@ BuildRequires:  systemd-rpm-macros
 %description
 CLI for managing resources in InfluxDB v2.
 
+%package bash-completion
+Summary:        Bash Completion for %{name}
+Group:          Productivity/Databases/Servers
+Requires:       bash-completion
+Supplements:    (%{name} and bash-completion)
+BuildArch:      noarch
+
+%description bash-completion
+The official bash completion script for influx. It includes support
+for every argument that can currently be passed to influx.
+
 %package zsh-completion
 Summary:        ZSH Completion for %{name}
 Group:          Productivity/Databases/Servers
@@ -69,6 +80,9 @@ go build -mod vendor -ldflags="-X main.version=%{version}" -o bin/influx ./cmd/i
 mkdir -p %{buildroot}%{_bindir}
 install -D -m 0755 bin/influx %{buildroot}%{_bindir}/
 
+mkdir -p %{buildroot}/%{_datadir}/bash-completion/completions
+bin/influx completion bash > %{buildroot}/%{_datadir}/bash-completion/completions/influx
+
 mkdir -p %{buildroot}/%{_datadir}/zsh/site-functions
 bin/influx completion zsh > %{buildroot}/%{_datadir}/zsh/site-functions/_influx
 
@@ -77,10 +91,16 @@ bin/influx completion zsh > %{buildroot}/%{_datadir}/zsh/site-functions/_influx
 %doc README.md CHANGELOG.md
 %{_bindir}/influx
 
+%files bash-completion
+%{_datadir}/bash-completion
+
 %files zsh-completion
 %{_datadir}/zsh
 
 %changelog
+* Wed Mar 12 2025 Mykhailo Bykhovtsev <mbykhovtsev@microsoft.com> - 2.7.5-2
+- Add back bash-completion subpackage for influx-cli
+
 * Tue Feb 11 2025 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 2.7.5-1
 - Auto-upgrade to 2.7.5 - Update influx-cli to match influxdb version for CVE-2023-44487
 
@@ -105,7 +125,7 @@ bin/influx completion zsh > %{buildroot}/%{_datadir}/zsh/site-functions/_influx
 * Thu Jun 15 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 2.6.1-9
 - Bump release to rebuild with go 1.19.10
 
-* Thu May 25 2023 Mykhailo Bykhovtsev <mbykhovtsev@microsft.com> - 2.6.1-8
+* Thu May 25 2023 Mykhailo Bykhovtsev <mbykhovtsev@microsoft.com> - 2.6.1-8
 - Removed bash-completion subpackage since the script produced is included in original bash-completion.
 
 * Wed Apr 05 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 2.6.1-7