From 6f6818c50d53bf874f4e3adc529125f70d13b975 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Thu, 22 Feb 2024 11:30:39 +0100
Subject: [PATCH 1/6] drop Python 2.7 from tests, add 3.9

2.7 was EL7 which we do not support anymore
3.9 is EL9
---
 .github/workflows/main.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fbada8d..6e6f3db 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,7 +13,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ["2.7", "3.8"]
+        python:
+          - "3.8"
+          - "3.9"
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python

From 0deedaab765d3230f9cafb795faee36ed7a9aa30 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Thu, 22 Feb 2024 11:31:10 +0100
Subject: [PATCH 2/6] stop testing on centos 7, start testing on centos stream
 9

---
 .github/workflows/main.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6e6f3db..49ac7f5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -38,7 +38,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        centos: ["7", "stream8"]
+        centos:
+          - stream8
+          - stream9
     container:
       image: quay.io/centos/centos:${{ matrix.centos }}
     steps:

From 63ed688db66d0da11b587197a594f14bc44aefb9 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Thu, 22 Feb 2024 11:36:44 +0100
Subject: [PATCH 3/6] make test.sh work on EL9

---
 test.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/test.sh b/test.sh
index 9fde0e5..957f06c 100755
--- a/test.sh
+++ b/test.sh
@@ -5,21 +5,20 @@ set -e
 export LC_ALL=en_US.UTF-8
 
 TEST_ON_EL=$([ -f /etc/redhat-release ] && [ -x /usr/bin/yum ] && echo "true" || echo "false")
-PYTHON=python
+PYTHON=python3
 
 if [[ "${TEST_ON_EL}" == "true" ]]; then
   . /etc/os-release
   if [[ $VERSION_ID == 8 ]] ; then
     # TODO: where's docbook-utils on EL8?
-    PACKAGES="python3 python3-setuptools"
-    PYTHON="python3"
+    PACKAGES=""
     # This is where Python 3 on EL8 installs packages to
     mkdir -p /usr/local/lib/python3.6/site-packages
-  elif [[ $VERSION_ID == 7 ]] ; then
-    PACKAGES="docbook-utils python-setuptools"
+  elif [[ $VERSION_ID == 9 ]] ; then
+    PACKAGES="docbook-utils"
   fi
 
-  yum install -y openssl rpm-build tree $PACKAGES
+  dnf install -y openssl rpm-build tree python3 python3-setuptools $PACKAGES
 fi
 
 if [[ -x /usr/bin/docbook2man ]] ; then

From cddac51a5efd903fff5f7fd911f25cf7ee42c8f8 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Thu, 22 Feb 2024 11:40:19 +0100
Subject: [PATCH 4/6] install docbook-utils from powertools on EL8

---
 test.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/test.sh b/test.sh
index 957f06c..57cda14 100755
--- a/test.sh
+++ b/test.sh
@@ -10,15 +10,14 @@ PYTHON=python3
 if [[ "${TEST_ON_EL}" == "true" ]]; then
   . /etc/os-release
   if [[ $VERSION_ID == 8 ]] ; then
-    # TODO: where's docbook-utils on EL8?
-    PACKAGES=""
+    REPOS="--enablerepo=powertools"
     # This is where Python 3 on EL8 installs packages to
     mkdir -p /usr/local/lib/python3.6/site-packages
   elif [[ $VERSION_ID == 9 ]] ; then
-    PACKAGES="docbook-utils"
+    REPOS=""
   fi
 
-  dnf install -y openssl rpm-build tree python3 python3-setuptools $PACKAGES
+  dnf install ${REPOS} -y openssl rpm-build tree python3 python3-setuptools docbook-utils
 fi
 
 if [[ -x /usr/bin/docbook2man ]] ; then

From def233ee5c525ed0769fac0294f59e11a841a169 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Thu, 22 Feb 2024 11:42:56 +0100
Subject: [PATCH 5/6] ensure glibc-langpack-en is present

---
 test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test.sh b/test.sh
index 57cda14..bf2c42a 100755
--- a/test.sh
+++ b/test.sh
@@ -17,7 +17,7 @@ if [[ "${TEST_ON_EL}" == "true" ]]; then
     REPOS=""
   fi
 
-  dnf install ${REPOS} -y openssl rpm-build tree python3 python3-setuptools docbook-utils
+  dnf install ${REPOS} -y openssl rpm-build tree python3 python3-setuptools docbook-utils glibc-langpack-en
 fi
 
 if [[ -x /usr/bin/docbook2man ]] ; then

From ae06319ae8ec4b4f0769c501fa063ef653fc3cd3 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Thu, 22 Feb 2024 11:43:42 +0100
Subject: [PATCH 6/6] cleanup

---
 test.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/test.sh b/test.sh
index bf2c42a..464b34b 100755
--- a/test.sh
+++ b/test.sh
@@ -4,16 +4,13 @@ set -e
 
 export LC_ALL=en_US.UTF-8
 
-TEST_ON_EL=$([ -f /etc/redhat-release ] && [ -x /usr/bin/yum ] && echo "true" || echo "false")
 PYTHON=python3
 
-if [[ "${TEST_ON_EL}" == "true" ]]; then
+if [[ -f /etc/redhat-release ]]; then
   . /etc/os-release
   if [[ $VERSION_ID == 8 ]] ; then
     REPOS="--enablerepo=powertools"
-    # This is where Python 3 on EL8 installs packages to
-    mkdir -p /usr/local/lib/python3.6/site-packages
-  elif [[ $VERSION_ID == 9 ]] ; then
+  else
     REPOS=""
   fi