Clean up for oracle 8 #1421

perfsonar · Mar 19, 2024 · be5da4a · be5da4a
1 parent 94ecb13
commit be5da4a
Show file tree

Hide file tree

Showing 101 changed files with 307 additions and 307 deletions.
diff --git a/...er-archiver-bitbucket/bitbucket/unibuild-packaging/rpm/pscheduler-archiver-bitbucket.spec b/...er-archiver-bitbucket/bitbucket/unibuild-packaging/rpm/pscheduler-archiver-bitbucket.spec
@@ -21,7 +21,7 @@ Source0:	%{short}-%{version}.tar.gz
 Provides:	%{name} = %{version}-%{release}
 
 Requires:	pscheduler-server >= 1.1.6
-Requires:	python-pscheduler
+Requires:	%{_pscheduler_python}-pscheduler
 
 BuildRequires:	pscheduler-rpm
 

diff --git a/pscheduler-archiver-esmond/esmond/unibuild-packaging/rpm/pscheduler-archiver-esmond.spec b/pscheduler-archiver-esmond/esmond/unibuild-packaging/rpm/pscheduler-archiver-esmond.spec
@@ -21,15 +21,15 @@ Source0:	%{short}-%{version}.tar.gz
 Provides:	%{name} = %{version}-%{release}
 
 Requires:	pscheduler-server >= 1.1.6
-Requires:	python-pscheduler >= 1.3.7.1
-Requires:	python-memcached
+Requires:	%{_pscheduler_python}-pscheduler >= 1.3.7.1
+Requires:	%{_pscheduler_python}-memcached
 Requires:	memcached
 Requires(post):	memcached
 Requires:		chkconfig
 
 BuildRequires:	pscheduler-rpm
-BuildRequires:  python-pscheduler
-BuildRequires:  python-nose
+BuildRequires:  %{_pscheduler_python}-pscheduler
+BuildRequires:  %{_pscheduler_python}-nose
 
 %define directory %{_includedir}/make
 
@@ -45,7 +45,7 @@ This archiver sends JSON test results to Esmond Measurement Archive
 
 %build
 make \
-     PYTHON=python \
+     PYTHON=%{_pscheduler_python} \
      DESTDIR=$RPM_BUILD_ROOT/%{dest} \
      install
 

diff --git a/pscheduler-archiver-failer/failer/unibuild-packaging/rpm/pscheduler-archiver-failer.spec b/pscheduler-archiver-failer/failer/unibuild-packaging/rpm/pscheduler-archiver-failer.spec
@@ -21,7 +21,7 @@ Source0:	%{short}-%{version}.tar.gz
 Provides:	%{name} = %{version}-%{release}
 
 Requires:	pscheduler-server >= 1.1.6
-Requires:	python-pscheduler
+Requires:	%{_pscheduler_python}-pscheduler
 
 BuildRequires:	pscheduler-rpm
 

diff --git a/pscheduler-archiver-http/http/unibuild-packaging/rpm/pscheduler-archiver-http.spec b/pscheduler-archiver-http/http/unibuild-packaging/rpm/pscheduler-archiver-http.spec
@@ -21,7 +21,7 @@ Source0:	%{short}-%{version}.tar.gz
 Provides:	%{name} = %{version}-%{release}
 
 Requires:	pscheduler-server >= 1.1.6.1
-Requires:	python-pscheduler >= 1.3.7.1
+Requires:	%{_pscheduler_python}-pscheduler >= 1.3.7.1
 
 BuildRequires:	pscheduler-rpm
 

diff --git a/pscheduler-archiver-kafka/kafka/unibuild-packaging/rpm/pscheduler-archiver-kafka.spec b/pscheduler-archiver-kafka/kafka/unibuild-packaging/rpm/pscheduler-archiver-kafka.spec
@@ -20,8 +20,8 @@ Source0:	%{short}-%{version}.tar.gz
 Provides:	%{name} = %{version}-%{release}
 
 Requires:	pscheduler-server >= 1.0.2
-Requires:       python-kafka
-Requires:       python-pscheduler
+Requires:       %{_pscheduler_python}-kafka
+Requires:       %{_pscheduler_python}-pscheduler
 
 BuildRequires:	pscheduler-rpm
 

diff --git a/...archiver-postgresql/postgresql/unibuild-packaging/rpm/pscheduler-archiver-postgresql.spec b/...archiver-postgresql/postgresql/unibuild-packaging/rpm/pscheduler-archiver-postgresql.spec
@@ -20,7 +20,7 @@ Source0:	%{short}-%{version}.tar.gz
 Provides:	%{name} = %{version}-%{release}
 
 Requires:	pscheduler-server >= 1.0.2
-Requires:	python-psycopg2 >= 2.6.1
+Requires:	%{_pscheduler_python}-psycopg2 >= 2.6.1
 
 BuildRequires:	pscheduler-rpm
 

diff --git a/...duler-archiver-rabbitmq/rabbitmq/unibuild-packaging/rpm/pscheduler-archiver-rabbitmq.spec b/...duler-archiver-rabbitmq/rabbitmq/unibuild-packaging/rpm/pscheduler-archiver-rabbitmq.spec
@@ -21,9 +21,9 @@ Source0:	%{short}-%{version}.tar.gz
 Provides:	%{name} = %{version}-%{release}
 
 Requires:	pscheduler-server >= 1.1.6
-Requires:	python-pscheduler >= 1.3.7.3
-Requires:	python-py-amqp >= 5.0.6
-Requires:	python-vine >= 5.0.0
+Requires:	%{_pscheduler_python}-pscheduler >= 1.3.7.3
+Requires:	%{_pscheduler_python}-py-amqp >= 5.0.6
+Requires:	%{_pscheduler_python}-vine >= 5.0.0
 
 BuildRequires:	pscheduler-rpm
 

diff --git a/...duler-archiver-snmptrap/snmptrap/unibuild-packaging/rpm/pscheduler-archiver-snmptrap.spec b/...duler-archiver-snmptrap/snmptrap/unibuild-packaging/rpm/pscheduler-archiver-snmptrap.spec
@@ -21,8 +21,8 @@ Source0:	%{short}-%{version}.tar.gz
 Provides:	%{name} = %{version}-%{release}
 
 Requires:	pscheduler-server
-Requires:	python-pscheduler
-Requires:	python-pysnmp
+Requires:	%{_pscheduler_python}-pscheduler
+Requires:	%{_pscheduler_python}-pysnmp
 
 BuildRequires:	pscheduler-rpm
 

diff --git a/pscheduler-archiver-tcp/tcp/unibuild-packaging/rpm/pscheduler-archiver-tcp.spec b/pscheduler-archiver-tcp/tcp/unibuild-packaging/rpm/pscheduler-archiver-tcp.spec
@@ -21,11 +21,11 @@ Source0:	%{short}-%{version}.tar.gz
 Provides:	%{name} = %{version}-%{release}
 
 Requires:	pscheduler-server >= 1.1.6.1
-Requires:	python-pscheduler >= 4.4.0
+Requires:	%{_pscheduler_python}-pscheduler >= 4.4.0
 
 BuildRequires:	pscheduler-rpm
-BuildRequires:  python
-BuildRequires:	python-nose
+BuildRequires:  %{_pscheduler_python}
+BuildRequires:	%{_pscheduler_python}-nose
 
 %define directory %{_includedir}/make
 

diff --git a/pscheduler-archiver-udp/udp/unibuild-packaging/rpm/pscheduler-archiver-udp.spec b/pscheduler-archiver-udp/udp/unibuild-packaging/rpm/pscheduler-archiver-udp.spec
@@ -21,11 +21,11 @@ Source0:	%{short}-%{version}.tar.gz
 Provides:	%{name} = %{version}-%{release}
 
 Requires:	pscheduler-server >= 1.1.6.1
-Requires:	python-pscheduler >= 5.0.0
+Requires:	%{_pscheduler_python}-pscheduler >= 5.0.0
 
 BuildRequires:	pscheduler-rpm
-BuildRequires:  python
-BuildRequires:	python-nose
+BuildRequires:  %{_pscheduler_python}
+BuildRequires:	%{_pscheduler_python}-nose
 
 %define directory %{_includedir}/make
 

diff --git a/...r-context-changefail/changefail/unibuild-packaging/rpm/pscheduler-context-changefail.spec b/...r-context-changefail/changefail/unibuild-packaging/rpm/pscheduler-context-changefail.spec
@@ -21,7 +21,7 @@ Source0:	%{short}-%{version}.tar.gz
 Provides:	%{name} = %{version}-%{release}
 
 Requires:	pscheduler-server
-Requires:	python-pscheduler
+Requires:	%{_pscheduler_python}-pscheduler
 
 BuildRequires:	pscheduler-rpm >= 1.0.0.5.1
 

diff --git a/...-changenothing/changenothing/unibuild-packaging/rpm/pscheduler-context-changenothing.spec b/...-changenothing/changenothing/unibuild-packaging/rpm/pscheduler-context-changenothing.spec
@@ -21,7 +21,7 @@ Source0:	%{short}-%{version}.tar.gz
 Provides:	%{name} = %{version}-%{release}
 
 Requires:	pscheduler-server
-Requires:	python-pscheduler
+Requires:	%{_pscheduler_python}-pscheduler
 
 BuildRequires:	pscheduler-rpm >= 1.0.0.5.1
 

diff --git a/pscheduler-context-linuxnns/linuxnns/unibuild-packaging/rpm/pscheduler-context-linuxnns.spec b/pscheduler-context-linuxnns/linuxnns/unibuild-packaging/rpm/pscheduler-context-linuxnns.spec
@@ -25,7 +25,7 @@ Source0:	%{short}-%{version}.tar.gz
 Provides:	%{name} = %{version}-%{release}
 
 Requires:	pscheduler-server
-Requires:	python-pscheduler
+Requires:	%{_pscheduler_python}-pscheduler
 Requires:	iproute
 
 BuildRequires:	pscheduler-rpm >= 1.0.0.5.1

diff --git a/pscheduler-context-linuxvrf/linuxvrf/unibuild-packaging/rpm/pscheduler-context-linuxvrf.spec b/pscheduler-context-linuxvrf/linuxvrf/unibuild-packaging/rpm/pscheduler-context-linuxvrf.spec
@@ -25,7 +25,7 @@ Source0:	%{short}-%{version}.tar.gz
 Provides:	%{name} = %{version}-%{release}
 
 Requires:	pscheduler-server
-Requires:	python-pscheduler
+Requires:	%{_pscheduler_python}-pscheduler
 Requires:	iproute
 
 BuildRequires:	pscheduler-rpm >= 1.0.0.5.1

diff --git a/pscheduler-core/pscheduler-core/unibuild-packaging/rpm/pscheduler-core.spec b/pscheduler-core/pscheduler-core/unibuild-packaging/rpm/pscheduler-core.spec
@@ -26,8 +26,8 @@ Requires:       gnuplot >= 4.6.2
 
 # This is for netstat.
 Requires:       net-tools
-Requires:       python-babel
-Requires:       python-pscheduler >= 4.4.0
+Requires:       %{_pscheduler_python}-babel
+Requires:       %{_pscheduler_python}-pscheduler >= 4.4.0
 
 Requires:	curl
 Requires:       dmidecode

diff --git a/pscheduler-server/pscheduler-server/unibuild-packaging/rpm/pscheduler-server.spec b/pscheduler-server/pscheduler-server/unibuild-packaging/rpm/pscheduler-server.spec
@@ -54,29 +54,29 @@ Requires:	curl
 Requires:	psmisc
 Requires:	pscheduler-account
 # This is from EPEL but doesn't have a python36 prefix
-Requires:	python-daemon
-Requires:	python-flask
-Requires:	python-psutil
+Requires:	%{_pscheduler_python}-daemon
+Requires:	%{_pscheduler_python}-flask
+Requires:	%{_pscheduler_python}-psutil
 
 # API Server
 BuildRequires:	pscheduler-account
 BuildRequires:	pscheduler-rpm
-BuildRequires:	python-parse-crontab
-BuildRequires:	python-pscheduler >= 5.1.0
+BuildRequires:	%{_pscheduler_python}-parse-crontab
+BuildRequires:	%{_pscheduler_python}-pscheduler >= 5.1.0
 BuildRequires:	m4
 Requires:	httpd-wsgi-socket
 # Note that the actual definition of what protocol is used is part of
 # python-pscheduler, but this package is what does the serving, so
 # mod_ssl is required here.
 Requires:	mod_ssl
 Requires:	mod_wsgi > 4.0
-Requires:	python-parse-crontab
-Requires:	python-pscheduler >= 5.1.0
-Requires:	python-pytz
+Requires:	%{_pscheduler_python}-parse-crontab
+Requires:	%{_pscheduler_python}-pscheduler >= 5.1.0
+Requires:	%{_pscheduler_python}-pytz
 
 # General
 BuildRequires:	pscheduler-rpm
-BuildRequires:  python
+BuildRequires:  %{_pscheduler_python}
 BuildRequires:	systemd
 %{?systemd_requires: %systemd_requires}
 

diff --git a/pscheduler-test-clock/clock/unibuild-packaging/rpm/pscheduler-test-clock.spec b/pscheduler-test-clock/clock/unibuild-packaging/rpm/pscheduler-test-clock.spec
@@ -21,7 +21,7 @@ Source0:	%{short}-%{version}.tar.gz
 Provides:	%{name} = %{version}-%{release}
 
 Requires:	pscheduler-server >= 1.1.6
-Requires:	python-pscheduler >= 1.3
+Requires:	%{_pscheduler_python}-pscheduler >= 1.3
 
 BuildRequires:	pscheduler-rpm
 
@@ -38,7 +38,7 @@ Clock test class for pScheduler
 
 %build
 make \
-     PYTHON=python \
+     PYTHON=%{_pscheduler_python} \
      DESTDIR=$RPM_BUILD_ROOT/%{dest} \
      install
 

diff --git a/pscheduler-test-dhcp/dhcp/unibuild-packaging/rpm/pscheduler-test-dhcp.spec b/pscheduler-test-dhcp/dhcp/unibuild-packaging/rpm/pscheduler-test-dhcp.spec
@@ -29,7 +29,7 @@ Provides:	%{name} = %{version}-%{release}
 
 # Include all required libraries here
 Requires:	pscheduler-server
-Requires:	python-pscheduler >= 1.3
+Requires:	%{_pscheduler_python}-pscheduler >= 1.3
 
 BuildRequires:	pscheduler-rpm
 
@@ -46,7 +46,7 @@ dhcp test class for pScheduler
 
 %build
 make \
-     PYTHON=python \
+     PYTHON=%{_pscheduler_python} \
      DESTDIR=$RPM_BUILD_ROOT/%{dest} \
      install
 

diff --git a/...r-test-disk-to-disk/disk-to-disk/unibuild-packaging/rpm/pscheduler-test-disk-to-disk.spec b/...r-test-disk-to-disk/disk-to-disk/unibuild-packaging/rpm/pscheduler-test-disk-to-disk.spec
@@ -29,7 +29,7 @@ Provides:	%{name} = %{version}-%{release}
 
 # Include all required libraries here
 Requires:	pscheduler-server
-Requires:	python-pscheduler >= 1.3
+Requires:	%{_pscheduler_python}-pscheduler >= 1.3
 
 BuildRequires:	pscheduler-rpm
 
@@ -46,7 +46,7 @@ disk-to-disk test class for pScheduler
 
 %build
 make \
-     PYTHON=python \
+     PYTHON=%{_pscheduler_python} \
      DESTDIR=$RPM_BUILD_ROOT/%{dest} \
      install
 

diff --git a/pscheduler-test-dns/dns/unibuild-packaging/rpm/pscheduler-test-dns.spec b/pscheduler-test-dns/dns/unibuild-packaging/rpm/pscheduler-test-dns.spec
@@ -21,7 +21,7 @@ Source0:	%{short}-%{version}.tar.gz
 Provides:	%{name} = %{version}-%{release}
 
 Requires:	pscheduler-server
-Requires:	python-pscheduler >= 1.3
+Requires:	%{_pscheduler_python}-pscheduler >= 1.3
 
 BuildRequires:	pscheduler-rpm
 
@@ -38,7 +38,7 @@ DNS test class for pScheduler
 
 %build
 make \
-     PYTHON=python \
+     PYTHON=%{_pscheduler_python} \
      DESTDIR=$RPM_BUILD_ROOT/%{dest} \
      install
 

diff --git a/pscheduler-test-dot1x/dot1x/unibuild-packaging/rpm/pscheduler-test-dot1x.spec b/pscheduler-test-dot1x/dot1x/unibuild-packaging/rpm/pscheduler-test-dot1x.spec
@@ -29,7 +29,7 @@ Provides:	%{name} = %{version}-%{release}
 
 # Include all required libraries here
 Requires:	pscheduler-server
-Requires:	python-pscheduler >= 1.3
+Requires:	%{_pscheduler_python}-pscheduler >= 1.3
 
 BuildRequires:	pscheduler-rpm
 
@@ -46,7 +46,7 @@ dot1x test class for pScheduler
 
 %build
 make \
-     PYTHON=python \
+     PYTHON=%{_pscheduler_python} \
      DESTDIR=$RPM_BUILD_ROOT/%{dest} \
      install
 

diff --git a/pscheduler-test-http/http/unibuild-packaging/rpm/pscheduler-test-http.spec b/pscheduler-test-http/http/unibuild-packaging/rpm/pscheduler-test-http.spec
@@ -21,7 +21,7 @@ Source0:	%{short}-%{version}.tar.gz
 Provides:	%{name} = %{version}-%{release}
 
 Requires:	pscheduler-server
-Requires:	python-pscheduler >= 1.3
+Requires:	%{_pscheduler_python}-pscheduler >= 1.3
 
 BuildRequires:	pscheduler-rpm
 
@@ -38,7 +38,7 @@ HTTP test class for pScheduler
 
 %build
 make \
-     PYTHON=python \
+     PYTHON=%{_pscheduler_python} \
      DESTDIR=$RPM_BUILD_ROOT/%{dest} \
      install
 

diff --git a/pscheduler-test-idle/idle/unibuild-packaging/rpm/pscheduler-test-idle.spec b/pscheduler-test-idle/idle/unibuild-packaging/rpm/pscheduler-test-idle.spec
@@ -21,7 +21,7 @@ Source0:	%{short}-%{version}.tar.gz
 Provides:	%{name} = %{version}-%{release}
 
 Requires:	pscheduler-server >= 1.1.6
-Requires:	python-pscheduler
+Requires:	%{_pscheduler_python}-pscheduler
 
 BuildRequires:	pscheduler-rpm
 
@@ -38,7 +38,7 @@ Idle test class for pScheduler
 
 %build
 make \
-     PYTHON=python \
+     PYTHON=%{_pscheduler_python} \
      DESTDIR=$RPM_BUILD_ROOT/%{dest} \
      install
 

diff --git a/pscheduler-test-idlebgm/idlebgm/unibuild-packaging/rpm/pscheduler-test-idlebgm.spec b/pscheduler-test-idlebgm/idlebgm/unibuild-packaging/rpm/pscheduler-test-idlebgm.spec
@@ -21,7 +21,7 @@ Source0:	%{short}-%{version}.tar.gz
 Provides:	%{name} = %{version}-%{release}
 
 Requires:	pscheduler-server >= 1.1.6
-Requires:	python-pscheduler
+Requires:	%{_pscheduler_python}-pscheduler
 
 BuildRequires:	pscheduler-rpm
 
@@ -39,7 +39,7 @@ produces multiple results.
 
 %build
 make \
-     PYTHON=python \
+     PYTHON=%{_pscheduler_python} \
      DESTDIR=$RPM_BUILD_ROOT/%{dest} \
      install
 

diff --git a/pscheduler-test-idleex/idleex/unibuild-packaging/rpm/pscheduler-test-idleex.spec b/pscheduler-test-idleex/idleex/unibuild-packaging/rpm/pscheduler-test-idleex.spec
@@ -21,7 +21,7 @@ Source0:	%{short}-%{version}.tar.gz
 Provides:	%{name} = %{version}-%{release}
 
 Requires:	pscheduler-server
-Requires:	python-pscheduler
+Requires:	%{_pscheduler_python}-pscheduler
 
 BuildRequires:	pscheduler-rpm
 
@@ -38,7 +38,7 @@ Idle test class for pScheduler that runs exclusively.
 
 %build
 make \
-     PYTHON=python \
+     PYTHON=%{_pscheduler_python} \
      DESTDIR=$RPM_BUILD_ROOT/%{dest} \
      install