From 2c571c821b4f34d76890eaa70ab433822557f7f9 Mon Sep 17 00:00:00 2001
From: Thomas Huth <thuth@redhat.com>
Date: Thu, 28 Mar 2024 10:56:56 +0100
Subject: mappings: Mark ctags and python3-pillow as available on CS9 /
 AlmaLinux 9

These packages are available in EPEL 9 now, so we can mark them as
available for CentOS Stream 9 / AlmaLinux 9, too. Since we don't have
to support CentOS 7 anymore, simply remove the specific entries so
that these distribution can now use the "default:" entry instead.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 lcitool/facts/mappings.yml                  | 8 --------
 tests/data/packages/out/almalinux-9.yml     | 3 ++-
 tests/data/packages/out/centos-stream-9.yml | 3 ++-
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/lcitool/facts/mappings.yml b/lcitool/facts/mappings.yml
index a990533..f09f84d 100644
--- a/lcitool/facts/mappings.yml
+++ b/lcitool/facts/mappings.yml
@@ -292,10 +292,6 @@ mappings:
   ctags:
     default: ctags
     deb: exuberant-ctags
-    AlmaLinux:
-    CentOS:
-    AlmaLinux8: ctags
-    CentOSStream8: ctags
 
   cyrus-sasl:
     apk: cyrus-sasl-dev
@@ -1745,12 +1741,8 @@ mappings:
     default: python3-pillow
     apk: py3-pillow
     pkg: py39-pillow
-    AlmaLinux:
-    CentOS:
     MacOS:
     OpenSUSE: python3-Pillow
-    AlmaLinux8: python3-pillow
-    CentOSStream8: python3-pillow
 
   python3-pip:
     default: python3-pip
diff --git a/tests/data/packages/out/almalinux-9.yml b/tests/data/packages/out/almalinux-9.yml
index 46794f2..94a3c94 100644
--- a/tests/data/packages/out/almalinux-9.yml
+++ b/tests/data/packages/out/almalinux-9.yml
@@ -32,6 +32,7 @@ native:
 - cloud-init
 - cloud-utils-growpart
 - cpp
+- ctags
 - cyrus-sasl-devel
 - daxctl-devel
 - dbus-daemon
@@ -220,6 +221,7 @@ native:
 - python3-libxml2
 - python3-lxml
 - python3-numpy
+- python3-pillow
 - python3-pip
 - python3-pytest
 - python3-requests
@@ -276,4 +278,3 @@ native:
 - zstd
 pypi:
 - black
-- pillow
diff --git a/tests/data/packages/out/centos-stream-9.yml b/tests/data/packages/out/centos-stream-9.yml
index 46794f2..94a3c94 100644
--- a/tests/data/packages/out/centos-stream-9.yml
+++ b/tests/data/packages/out/centos-stream-9.yml
@@ -32,6 +32,7 @@ native:
 - cloud-init
 - cloud-utils-growpart
 - cpp
+- ctags
 - cyrus-sasl-devel
 - daxctl-devel
 - dbus-daemon
@@ -220,6 +221,7 @@ native:
 - python3-libxml2
 - python3-lxml
 - python3-numpy
+- python3-pillow
 - python3-pip
 - python3-pytest
 - python3-requests
@@ -276,4 +278,3 @@ native:
 - zstd
 pypi:
 - black
-- pillow
-- 
cgit v1.1