From 04ae9b96f2acb7c7c5adbaf4aca7a27745c45d20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Fri, 18 Jun 2021 18:49:37 +0200
Subject: [PATCH] CI: Adapt pythondist.spec for Python 3.10 being the main
 Python version

Preserves comaptbility with Python 3.9.
---
 tests/pythondist.sh   | 11 +++++++++++
 tests/pythondist.spec | 25 +++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/tests/pythondist.sh b/tests/pythondist.sh
index 556f5e8..4f2e15d 100755
--- a/tests/pythondist.sh
+++ b/tests/pythondist.sh
@@ -25,7 +25,17 @@ rpm -qp --provides ${RPMDIR}/python3.7-zope-component-4.3.0-0.noarch.rpm | grep
 rpm -qp --requires ${RPMDIR}/python3.7-zope-component-4.3.0-0.noarch.rpm | grep '^python3\.7dist(zope-event)'
 rpm -qp --requires ${RPMDIR}/python3.7-zope-component-4.3.0-0.noarch.rpm | grep '^python3\.7dist(zope-interface)'
 
+if [ "$X_Y" != "3.9" ]; then
+rpm -qp --provides ${RPMDIR}/python3.9-zope-component-4.3.0-0.noarch.rpm | grep '^python3dist(zope\.component)' && exit 1 || true
+rpm -qp --provides ${RPMDIR}/python3.9-zope-component-4.3.0-0.noarch.rpm | grep '^python3dist(zope-component)' && exit 1 || true
+rpm -qp --provides ${RPMDIR}/python3.9-zope-component-4.3.0-0.noarch.rpm | grep '^python3\.9dist(zope\.component)'
+rpm -qp --provides ${RPMDIR}/python3.9-zope-component-4.3.0-0.noarch.rpm | grep '^python3\.9dist(zope-component)'
 
+rpm -qp --requires ${RPMDIR}/python3.9-zope-component-4.3.0-0.noarch.rpm | grep '^python3\.9dist(zope-event)'
+rpm -qp --requires ${RPMDIR}/python3.9-zope-component-4.3.0-0.noarch.rpm | grep '^python3\.9dist(zope-interface)'
+fi
+
+if [ "$X_Y" != "3.10" ]; then
 rpm -qp --provides ${RPMDIR}/python3.10-zope-component-4.3.0-0.noarch.rpm | grep '^python3dist(zope\.component)' && exit 1 || true
 rpm -qp --provides ${RPMDIR}/python3.10-zope-component-4.3.0-0.noarch.rpm | grep '^python3dist(zope-component)' && exit 1 || true
 rpm -qp --provides ${RPMDIR}/python3.10-zope-component-4.3.0-0.noarch.rpm | grep '^python3\.10dist(zope\.component)'
@@ -33,3 +43,4 @@ rpm -qp --provides ${RPMDIR}/python3.10-zope-component-4.3.0-0.noarch.rpm | grep
 
 rpm -qp --requires ${RPMDIR}/python3.10-zope-component-4.3.0-0.noarch.rpm | grep '^python3\.10dist(zope-event)'
 rpm -qp --requires ${RPMDIR}/python3.10-zope-component-4.3.0-0.noarch.rpm | grep '^python3\.10dist(zope-interface)'
+fi
diff --git a/tests/pythondist.spec b/tests/pythondist.spec
index 672e04a..960c716 100644
--- a/tests/pythondist.spec
+++ b/tests/pythondist.spec
@@ -24,10 +24,19 @@ Summary:        ...
 %description -n python3.7-zope-component
 ...
 
+%if v"%{python3_version}" != v"3.9"
+%package -n python3.9-zope-component
+Summary:        ...
+%description -n python3.9-zope-component
+...
+%endif
+
+%if v"%{python3_version}" != v"3.10"
 %package -n python3.10-zope-component
 Summary:        ...
 %description -n python3.10-zope-component
 ...
+%endif
 
 %prep
 %autosetup -n zope.component-%{version}
@@ -42,9 +51,17 @@ mkdir -p %{buildroot}/usr/lib/python3.7/site-packages
 cp -a %{buildroot}%{python3_sitelib}/zope.component-%{version}-py%{python3_version}.egg-info \
       %{buildroot}/usr/lib/python3.7/site-packages/zope.component-%{version}-py3.7.egg-info
 
+%if v"%{python3_version}" != v"3.9"
+mkdir -p %{buildroot}/usr/lib/python3.9/site-packages
+cp -a %{buildroot}%{python3_sitelib}/zope.component-%{version}-py%{python3_version}.egg-info \
+      %{buildroot}/usr/lib/python3.9/site-packages/zope.component-%{version}-py3.9.egg-info
+%endif
+
+%if v"%{python3_version}" != v"3.10"
 mkdir -p %{buildroot}/usr/lib/python3.10/site-packages
 cp -a %{buildroot}%{python3_sitelib}/zope.component-%{version}-py%{python3_version}.egg-info \
       %{buildroot}/usr/lib/python3.10/site-packages/zope.component-%{version}-py3.10.egg-info
+%endif
 
 %files -n python3-zope-component
 %license LICENSE.txt
@@ -54,6 +71,14 @@ cp -a %{buildroot}%{python3_sitelib}/zope.component-%{version}-py%{python3_versi
 %license LICENSE.txt
 /usr/lib/python3.7/site-packages/zope.component-%{version}-py3.7.egg-info/
 
+%if v"%{python3_version}" != v"3.9"
+%files -n python3.9-zope-component
+%license LICENSE.txt
+/usr/lib/python3.9/site-packages/zope.component-%{version}-py3.9.egg-info/
+%endif
+
+%if v"%{python3_version}" != v"3.10"
 %files -n python3.10-zope-component
 %license LICENSE.txt
 /usr/lib/python3.10/site-packages/zope.component-%{version}-py3.10.egg-info/
+%endif