Merge branch 'main' into joslobo/merge-for-may-update-2

microsoft · May 26, 2023 · 19f52d3 · 19f52d3
2 parents d0c84d3 + 1e870f6
commit 19f52d3
Show file tree

Hide file tree

Showing 9 changed files with 7,871 additions and 20 deletions.
diff --git a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md
diff --git a/SPECS/LICENSES-AND-NOTICES/data/licenses.json b/SPECS/LICENSES-AND-NOTICES/data/licenses.json
@@ -2182,6 +2182,7 @@
                 "livepatch-5.15.107.1-1.cm2",
                 "livepatch-5.15.110.1-1.cm2",
                 "livepatch-5.15.111.1-1.cm2",
+                "livepatch-5.15.112.1-1.cm2",
                 "livepatch-5.15.94.1-1.cm2",
                 "livepatch-5.15.94.1-1.cm2-signed",
                 "livepatch-5.15.95.1-1.cm2",

diff --git a/SPECS/influx-cli/influx-cli.spec b/SPECS/influx-cli/influx-cli.spec
@@ -18,7 +18,7 @@
 Summary:        CLI for managing resources in InfluxDB
 Name:           influx-cli
 Version:        2.6.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -46,17 +46,6 @@ 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
@@ -80,9 +69,6 @@ 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
 
@@ -91,13 +77,13 @@ 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
+* Thu May 25 2023 Mykhailo Bykhovtsev <mbykhovtsev@microsft.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
 - Bump release to rebuild with go 1.19.8