mappings: Make some more packages available on CentOS Stream 9 / AlmaLinux 9

A bunch of packages are currently marked as non-available in CentOS
Stream 9 / AlmaLinux 9, though they are available in the distribution
(or in EPEL 9). Looks like these were originally disabled since they
were not supported in CentOS 7, then only enabled for CentOS Stream 8
and AlmaLinux 8, but then forgotten to be added when the major version 9
came around.

Since we already dropped support for CentOS 7 in lcitool a while ago,
we can simply fix the problem by removing the special entries for
generic CentOS / AlmaLinux and for version 8 of these distributions,
so that all of them now use the default "rpm:" mapping.

Signed-off-by: Thomas Huth <thuth@redhat.com>

3 files changed, 10 insertions, 20 deletions

diff --git a/lcitool/facts/mappings.yml b/lcitool/facts/mappings.yml
index 2c03102..a990533 100644
--- a/lcitool/facts/mappings.yml
+++ b/lcitool/facts/mappings.yml
@@ -766,10 +766,6 @@ mappings:
   libcacard:
     deb: libcacard-dev
     rpm: libcacard-devel
-    AlmaLinux:
-    CentOS:
-    AlmaLinux8: libcacard-devel
-    CentOSStream8: libcacard-devel
     cross-policy-default: foreign
 
   libcap-ng:
@@ -824,10 +820,6 @@ mappings:
     apk: libev-dev
     deb: libev-dev
     rpm: libev-devel
-    AlmaLinux:
-    CentOS:
-    AlmaLinux8: libev-devel
-    CentOSStream8: libev-devel
     cross-policy-default: foreign
 
   libfdt:
@@ -881,11 +873,7 @@ mappings:
   libiscsi:
     deb: libiscsi-dev
     rpm: libiscsi-devel
-    AlmaLinux:
-    CentOS:
     MacOS: libiscsi
-    AlmaLinux8: libiscsi-devel
-    CentOSStream8: libiscsi-devel
     cross-policy-default: foreign
 
   libjemalloc:
@@ -1033,10 +1021,6 @@ mappings:
     apk: libslirp-dev
     deb: libslirp-dev
     rpm: libslirp-devel
-    AlmaLinux:
-    CentOS:
-    AlmaLinux8: libslirp-devel
-    CentOSStream8: libslirp-devel
     cross-policy-default: foreign
 
   libsoup:
@@ -1115,10 +1099,6 @@ mappings:
     apk: liburing-dev
     deb: liburing-dev
     rpm: liburing-devel
-    AlmaLinux:
-    CentOS:
-    AlmaLinux8: liburing-devel
-    CentOSStream8: liburing-devel
     Ubuntu2004:
     cross-policy-default: foreign
 
diff --git a/tests/data/packages/out/almalinux-9.yml b/tests/data/packages/out/almalinux-9.yml
index 09041ac..46794f2 100644
--- a/tests/data/packages/out/almalinux-9.yml
+++ b/tests/data/packages/out/almalinux-9.yml
@@ -95,16 +95,19 @@ native:
 - libattr-devel
 - libblkid-devel
 - libbpf-devel
+- libcacard-devel
 - libcap-ng-devel
 - libcmocka-devel
 - libconfig-devel
 - libcurl-devel
 - libdrm-devel
 - libepoxy-devel
+- libev-devel
 - libfdt-devel
 - libffi-devel
 - libgcrypt-devel
 - libguestfs-devel
+- libiscsi-devel
 - libjpeg-devel
 - libnbd-devel
 - libnfs-devel
@@ -116,6 +119,7 @@ native:
 - librbd-devel
 - libseccomp-devel
 - libselinux-devel
+- libslirp-devel
 - libsoup-devel
 - libssh-devel
 - libssh2-devel
@@ -124,6 +128,7 @@ native:
 - libtool
 - libtorrent-devel
 - libubsan
+- liburing-devel
 - libusbx-devel
 - libuuid-devel
 - libvirt-devel
diff --git a/tests/data/packages/out/centos-stream-9.yml b/tests/data/packages/out/centos-stream-9.yml
index 09041ac..46794f2 100644
--- a/tests/data/packages/out/centos-stream-9.yml
+++ b/tests/data/packages/out/centos-stream-9.yml
@@ -95,16 +95,19 @@ native:
 - libattr-devel
 - libblkid-devel
 - libbpf-devel
+- libcacard-devel
 - libcap-ng-devel
 - libcmocka-devel
 - libconfig-devel
 - libcurl-devel
 - libdrm-devel
 - libepoxy-devel
+- libev-devel
 - libfdt-devel
 - libffi-devel
 - libgcrypt-devel
 - libguestfs-devel
+- libiscsi-devel
 - libjpeg-devel
 - libnbd-devel
 - libnfs-devel
@@ -116,6 +119,7 @@ native:
 - librbd-devel
 - libseccomp-devel
 - libselinux-devel
+- libslirp-devel
 - libsoup-devel
 - libssh-devel
 - libssh2-devel
@@ -124,6 +128,7 @@ native:
 - libtool
 - libtorrent-devel
 - libubsan
+- liburing-devel
 - libusbx-devel
 - libuuid-devel
 - libvirt-devel