From 204919917e4af5281c85c9e29542fedeb20c0bd7 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Tue, 12 Nov 2024 22:54:46 +0100
Subject: [PATCH 1/2] playbooks: Restore the generation & installation of the
 Bash completions

The package providing /usr/share/pkgconfig/bash-completion.pc changed
from bash-completion to bash-completion-devel in Fedora 41 onwards [1].
This meant that the Bash completions were no longer being generated and
installed by the CI.

[1] Fedora bash-completion commit d1f5dc48c0440cc6
    https://src.fedoraproject.org/rpms/bash-completion/c/d1f5dc48c0440cc6
    https://bugzilla.redhat.com/show_bug.cgi?id=1457164

https://github.com/containers/toolbox/pull/1593
---
 playbooks/dependencies-fedora-restricted.yaml | 4 ++--
 playbooks/dependencies-fedora.yaml            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/playbooks/dependencies-fedora-restricted.yaml b/playbooks/dependencies-fedora-restricted.yaml
index 914d1ac15..7463f0eb2 100644
--- a/playbooks/dependencies-fedora-restricted.yaml
+++ b/playbooks/dependencies-fedora-restricted.yaml
@@ -31,7 +31,6 @@
   package:
     name:
       - ShellCheck
-      - bash-completion
       - codespell
       - fish
       - flatpak-session-helper
@@ -40,6 +39,7 @@
       - golang-github-cpuguy83-md2man
       - meson
       - ninja-build
+      - pkgconfig(bash-completion)
       - shadow-utils-subid-devel
       - systemd
       - udisks2
@@ -81,4 +81,4 @@
     chdir: '{{ zuul.project.src_dir }}'
 
 - name: Check versions of crucial packages
-  command: rpm -qa ShellCheck codespell *kernel* gcc *glibc* shadow-utils-subid-devel golang golang-github-cpuguy83-md2man flatpak-session-helper
+  command: rpm -qa ShellCheck bash-completion codespell *kernel* gcc *glibc* shadow-utils-subid-devel golang golang-github-cpuguy83-md2man flatpak-session-helper
diff --git a/playbooks/dependencies-fedora.yaml b/playbooks/dependencies-fedora.yaml
index 8007ce958..c22e635d3 100644
--- a/playbooks/dependencies-fedora.yaml
+++ b/playbooks/dependencies-fedora.yaml
@@ -20,7 +20,6 @@
     update_cache: "{{ true if zuul.attempts > 1 else false }}"
     name:
       - ShellCheck
-      - bash-completion
       - bats
       - codespell
       - fish
@@ -32,6 +31,7 @@
       - meson
       - ninja-build
       - openssl
+      - pkgconfig(bash-completion)
       - podman
       - shadow-utils-subid-devel
       - skopeo
@@ -55,7 +55,7 @@
     chdir: '{{ zuul.project.src_dir }}'
 
 - name: Check versions of crucial packages
-  command: rpm -qa ShellCheck bash bats codespell *kernel* gcc *glibc* shadow-utils-subid-devel golang golang-github-cpuguy83-md2man podman conmon containernetworking-plugins containers-common container-selinux crun fuse-overlayfs flatpak-session-helper skopeo
+  command: rpm -qa ShellCheck bash bash-completion bats codespell *kernel* gcc *glibc* shadow-utils-subid-devel golang golang-github-cpuguy83-md2man podman conmon containernetworking-plugins containers-common container-selinux crun fuse-overlayfs flatpak-session-helper skopeo
 
 - name: Show podman versions
   command: podman version

From c11a03ce37024c2cb42ad69b6a7c1981cb1de235 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Thu, 14 Nov 2024 01:20:00 +0100
Subject: [PATCH 2/2] playbooks: Use pkgconfig(bash-completion) to install
 bash-completion.pc

Unlike Fedora, where the package providing bash-completion.pc changed in
Fedora 41 onwards [1,2], it hasn't changed in CentOS Stream 9.  So, this
doesn't change the behaviour of the CI.

However, the Fedora Packaging Guidelines recommend using pkgconfig(...)
to depend on a *.pc file [3], instead of the name of the package, and
there has been a problem on Fedora caused by not doing that.  Therefore,
it's better to follow the guidelines for consistency and safety.

[1] Fedora bash-completion commit d1f5dc48c0440cc6
    https://src.fedoraproject.org/rpms/bash-completion/c/d1f5dc48c0440cc6
    https://bugzilla.redhat.com/show_bug.cgi?id=1457164

[2] Commit 204919917e4af528
    https://github.com/containers/toolbox/commit/204919917e4af528

[3] https://docs.fedoraproject.org/en-US/packaging-guidelines/PkgConfigBuildRequires/

https://github.com/containers/toolbox/pull/1593
---
 playbooks/dependencies-centos-9-stream.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/playbooks/dependencies-centos-9-stream.yaml b/playbooks/dependencies-centos-9-stream.yaml
index 9e811af13..64c7ea198 100644
--- a/playbooks/dependencies-centos-9-stream.yaml
+++ b/playbooks/dependencies-centos-9-stream.yaml
@@ -2,7 +2,6 @@
   become: yes
   package:
     name:
-      - bash-completion
       - flatpak-session-helper
       - gcc
       - golang
@@ -10,6 +9,7 @@
       - meson
       - ninja-build
       - openssl
+      - pkgconfig(bash-completion)
       - podman
       - shadow-utils-subid-devel
       - skopeo
@@ -54,7 +54,7 @@
     chdir: '{{ zuul.project.src_dir }}'
 
 - name: Check versions of crucial packages
-  command: rpm -qa ShellCheck bash bats codespell *kernel* gcc *glibc* golang golang-github-cpuguy83-md2man shadow-utils-subid-devel podman conmon containernetworking-plugins containers-common container-selinux crun fuse-overlayfs flatpak-session-helper skopeo
+  command: rpm -qa ShellCheck bash bash-completion bats codespell *kernel* gcc *glibc* golang golang-github-cpuguy83-md2man shadow-utils-subid-devel podman conmon containernetworking-plugins containers-common container-selinux crun fuse-overlayfs flatpak-session-helper skopeo
 
 - name: Show podman versions
   command: podman version