Changes for oracle 8 supper #1421

perfsonar · Mar 19, 2024 · 7825ddd · 7825ddd
1 parent be5da4a
commit 7825ddd
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 16 deletions.
diff --git a/pscheduler-rpm/unibuild-packaging/rpm/pscheduler-rpm.spec b/pscheduler-rpm/unibuild-packaging/rpm/pscheduler-rpm.spec
@@ -35,6 +35,32 @@ cat > $RPM_BUILD_ROOT/%{macro_prefix}%{name} <<EOF
 #
 
 
+
+#
+# Python
+#
+
+# This is the version we like.
+%%_pscheduler_python_version_major 3
+
+%if 0%{?el7}
+%%error EL7 is no longer supported.  Try something newer.
+%endif
+
+%if 0%{?el8}%{?ol8}
+# EL8 standardized on just the major version, as did EPEL.
+%%_pscheduler_python python%%{_pscheduler_python_version_major}
+%%_pscheduler_python_epel python%%{_pscheduler_python_version_major}
+
+%else
+
+# EL9+ has everyting as just plain python
+%%_pscheduler_python python
+%%_pscheduler_python_epel python
+
+%endif
+
+
 #
 # PostgreSQL
 #

diff --git a/python-jsonschema/unibuild-packaging/rpm/python-jsonschema.spec b/python-jsonschema/unibuild-packaging/rpm/python-jsonschema.spec
@@ -22,12 +22,20 @@ URL:		http://pypi.python.org/pypi/jsonschema
 Source:		%{short}-%{version}.tar.gz
 
 Requires:       %{_pscheduler_python}
+
+%if 0%{?el8}
+Requires:       %{_pscheduler_python}-attrs
+%endif
+
 Requires:       %{_pscheduler_python}-pyrsistent
 # This is required for some reason.
 Requires:       %{_pscheduler_python}-setuptools
 
 BuildRequires:  %{_pscheduler_python}
 BuildRequires:  %{_pscheduler_python}-setuptools
+%if 0%{?el8}
+BuildRequires:  %{_pscheduler_python}-setuptools_scm
+%endif
 
 
 %description
@@ -45,11 +53,11 @@ JSON Schema library for Python
 
 
 %build
-python setup.py build
+%{_pscheduler_python} setup.py build
 
 
 %install
-python setup.py install --root=$RPM_BUILD_ROOT -O1  --record=INSTALLED_FILES
+%{_pscheduler_python} setup.py install --root=$RPM_BUILD_ROOT -O1  --record=INSTALLED_FILES
 
 # This package installs a binary that it really shouldn't because it
 # may overlap with the same file from other versions of the same

diff --git a/python-kafka/unibuild-packaging/rpm/python-kafka.spec b/python-kafka/unibuild-packaging/rpm/python-kafka.spec
@@ -38,11 +38,11 @@ This module implements Apache Kafka producers and consumers in pure python, whic
 
 
 %build
-python setup.py build
+%{_pscheduler_python} setup.py build
 
 
 %install
-python setup.py install --root=$RPM_BUILD_ROOT --single-version-externally-managed -O1  --record=INSTALLED_FILES
+%{_pscheduler_python} setup.py install --root=$RPM_BUILD_ROOT --single-version-externally-managed -O1  --record=INSTALLED_FILES
 
 
 %clean

diff --git a/python-nmap3/unibuild-packaging/rpm/python-nmap3.spec b/python-nmap3/unibuild-packaging/rpm/python-nmap3.spec
@@ -42,11 +42,11 @@ A python 3 library which helps in using nmap port scanner. The way this tools wo
 
 
 %build
-python setup.py build
+%{_pscheduler_python} setup.py build
 
 
 %install
-python setup.py install --root=$RPM_BUILD_ROOT --single-version-externally-managed -O1  --record=INSTALLED_FILES
+%{_pscheduler_python} setup.py install --root=$RPM_BUILD_ROOT --single-version-externally-managed -O1  --record=INSTALLED_FILES
 
 
 %clean

diff --git a/python-parse-crontab/unibuild-packaging/rpm/python-parse-crontab.spec b/python-parse-crontab/unibuild-packaging/rpm/python-parse-crontab.spec
@@ -42,11 +42,11 @@ time the job should be run.
 
 
 %build
-python setup.py build
+%{_pscheduler_python} setup.py build
 
 
 %install
-python setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES -O1
+%{_pscheduler_python} setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES -O1
 
 
 %clean

diff --git a/python-py-amqp/unibuild-packaging/rpm/python-py-amqp.spec b/python-py-amqp/unibuild-packaging/rpm/python-py-amqp.spec
@@ -39,11 +39,11 @@ A pure Python library for AMQP
 
 
 %build
-python setup.py build
+%{_pscheduler_python} setup.py build
 
 
 %install
-python setup.py install --root=$RPM_BUILD_ROOT --single-version-externally-managed -O1  --record=INSTALLED_FILES
+%{_pscheduler_python} setup.py install --root=$RPM_BUILD_ROOT --single-version-externally-managed -O1  --record=INSTALLED_FILES
 
 
 %clean

diff --git a/python-py-radix/unibuild-packaging/rpm/python-py-radix.spec b/python-py-radix/unibuild-packaging/rpm/python-py-radix.spec
@@ -42,11 +42,11 @@ A network address manipulation library for Python
 
 
 %build
-python setup.py build
+%{_pscheduler_python} setup.py build
 
 
 %install
-python setup.py install --root=$RPM_BUILD_ROOT -O1  --record=INSTALLED_FILES
+%{_pscheduler_python} setup.py install --root=$RPM_BUILD_ROOT -O1  --record=INSTALLED_FILES
 
 
 %clean

diff --git a/python-pyrsistent/unibuild-packaging/rpm/python-pyrsistent.spec b/python-pyrsistent/unibuild-packaging/rpm/python-pyrsistent.spec
@@ -47,11 +47,11 @@ immutable.
 
 
 %build
-python setup.py build
+%{_pscheduler_python} setup.py build
 
 
 %install
-python setup.py install --root=$RPM_BUILD_ROOT -O1  --record=INSTALLED_FILES
+%{_pscheduler_python} setup.py install --root=$RPM_BUILD_ROOT -O1  --record=INSTALLED_FILES
 
 
 %clean

diff --git a/python-vine/unibuild-packaging/rpm/python-vine.spec b/python-vine/unibuild-packaging/rpm/python-vine.spec
@@ -37,11 +37,11 @@ A pure Python library implementing promises
 
 
 %build
-python setup.py build
+%{_pscheduler_python} setup.py build
 
 
 %install
-python setup.py install --root=$RPM_BUILD_ROOT --single-version-externally-managed -O1  --record=INSTALLED_FILES
+%{_pscheduler_python} setup.py install --root=$RPM_BUILD_ROOT --single-version-externally-managed -O1  --record=INSTALLED_FILES
 
 
 %clean