From be5da4a8e7079f3bf9adf259305d03e34b8da33e Mon Sep 17 00:00:00 2001 From: Carl Sacco Date: Tue, 19 Mar 2024 18:12:12 +0000 Subject: [PATCH] Clean up for oracle 8 #1421 --- .../rpm/pscheduler-archiver-bitbucket.spec | 2 +- .../rpm/pscheduler-archiver-esmond.spec | 10 +-- .../rpm/pscheduler-archiver-failer.spec | 2 +- .../rpm/pscheduler-archiver-http.spec | 2 +- .../rpm/pscheduler-archiver-kafka.spec | 4 +- .../rpm/pscheduler-archiver-postgresql.spec | 2 +- .../rpm/pscheduler-archiver-rabbitmq.spec | 6 +- .../rpm/pscheduler-archiver-snmptrap.spec | 4 +- .../rpm/pscheduler-archiver-tcp.spec | 6 +- .../rpm/pscheduler-archiver-udp.spec | 6 +- .../rpm/pscheduler-context-changefail.spec | 2 +- .../rpm/pscheduler-context-changenothing.spec | 2 +- .../rpm/pscheduler-context-linuxnns.spec | 2 +- .../rpm/pscheduler-context-linuxvrf.spec | 2 +- .../rpm/pscheduler-core.spec | 4 +- .../rpm/pscheduler-server.spec | 18 ++--- .../rpm/pscheduler-test-clock.spec | 4 +- .../rpm/pscheduler-test-dhcp.spec | 4 +- .../rpm/pscheduler-test-disk-to-disk.spec | 4 +- .../rpm/pscheduler-test-dns.spec | 4 +- .../rpm/pscheduler-test-dot1x.spec | 4 +- .../rpm/pscheduler-test-http.spec | 4 +- .../rpm/pscheduler-test-idle.spec | 4 +- .../rpm/pscheduler-test-idlebgm.spec | 4 +- .../rpm/pscheduler-test-idleex.spec | 4 +- .../rpm/pscheduler-test-latency.spec | 8 +-- .../rpm/pscheduler-test-latencybg.spec | 8 +-- .../rpm/pscheduler-test-mtu.spec | 4 +- .../rpm/pscheduler-test-netreach.spec | 4 +- .../rpm/pscheduler-test-noop.spec | 4 +- .../rpm/pscheduler-test-openports.spec | 4 +- .../rpm/pscheduler-test-psresponse.spec | 4 +- .../rpm/pscheduler-test-rtt.spec | 8 +-- .../rpm/pscheduler-test-s3throughput.spec | 4 +- .../rpm/pscheduler-test-simplestream.spec | 4 +- .../rpm/pscheduler-test-snmpget.spec | 4 +- .../rpm/pscheduler-test-snmpgetbgm.spec | 4 +- .../rpm/pscheduler-test-snmpset.spec | 4 +- .../rpm/pscheduler-test-throughput.spec | 8 +-- .../rpm/pscheduler-test-trace.spec | 8 +-- .../rpm/pscheduler-test-wifibssid.spec | 4 +- .../rpm/pscheduler-tool-bssidscanner.spec | 2 +- .../rpm/pscheduler-tool-curl-d2d.spec | 6 +- .../rpm/pscheduler-tool-curl.spec | 6 +- .../rpm/pscheduler-tool-dhclient.spec | 4 +- .../rpm/pscheduler-tool-dnspy.spec | 6 +- .../pscheduler-tool-dublin-traceroute.spec | 4 +- .../rpm/pscheduler-tool-ethr.spec | 2 +- .../rpm/pscheduler-tool-fpingreach.spec | 2 +- .../rpm/pscheduler-tool-fwmtu.spec | 2 +- .../rpm/pscheduler-tool-globus.spec | 2 +- .../rpm/pscheduler-tool-halfping.spec | 2 +- .../rpm/pscheduler-tool-iperf2.spec | 4 +- .../rpm/pscheduler-tool-iperf3.spec | 6 +- .../rpm/pscheduler-tool-net-snmp-set.spec | 2 +- .../rpm/pscheduler-tool-nmapreach.spec | 2 +- .../rpm/pscheduler-tool-nmapscan.spec | 4 +- .../rpm/pscheduler-tool-nuttcp.spec | 4 +- .../rpm/pscheduler-tool-owping.spec | 8 +-- .../rpm/pscheduler-tool-paris-traceroute.spec | 4 +- .../rpm/pscheduler-tool-passthrough.spec | 2 +- .../rpm/pscheduler-tool-ping.spec | 4 +- .../rpm/pscheduler-tool-powstream.spec | 8 +-- .../rpm/pscheduler-tool-psclock.spec | 2 +- .../rpm/pscheduler-tool-pstimer.spec | 6 +- .../rpm/pscheduler-tool-psurl.spec | 2 +- .../rpm/pscheduler-tool-pysnmp.spec | 4 +- .../rpm/pscheduler-tool-s3-benchmark.spec | 2 +- .../rpm/pscheduler-tool-simplestreamer.spec | 2 +- .../rpm/pscheduler-tool-sleep.spec | 2 +- .../rpm/pscheduler-tool-sleepbgm.spec | 2 +- .../rpm/pscheduler-tool-snooze.spec | 2 +- .../rpm/pscheduler-tool-tcpping.spec | 4 +- .../rpm/pscheduler-tool-tracepath.spec | 4 +- .../rpm/pscheduler-tool-traceroute.spec | 4 +- .../rpm/pscheduler-tool-twping.spec | 8 +-- .../rpm/pscheduler-tool-umichwpa.spec | 2 +- .../unibuild-packaging/rpm/python-daemon.spec | 14 ++-- .../unibuild-packaging/rpm/python-flask.spec | 16 ++--- .../rpm/python-icmperror.spec | 8 +-- .../rpm/python-itsdangerous.spec | 8 +-- .../rpm/python-jsonschema.spec | 12 ++-- .../unibuild-packaging/rpm/python-kafka.spec | 8 +-- .../unibuild-packaging/rpm/python-nmap3.spec | 12 ++-- .../unibuild-packaging/rpm/python-nose.spec | 10 +-- .../unibuild-packaging/rpm/python-ntplib.spec | 8 +-- .../rpm/python-parse-crontab.spec | 8 +-- .../rpm/python-pscheduler.spec | 72 +++++++++---------- .../rpm/python-py-amqp.spec | 10 +-- .../rpm/python-py-radix.spec | 10 +-- .../rpm/python-pyasn1-modules.spec | 10 +-- .../unibuild-packaging/rpm/python-pyasn1.spec | 8 +-- .../unibuild-packaging/rpm/python-pyjq.spec | 8 +-- .../rpm/python-pyrsistent.spec | 14 ++-- .../unibuild-packaging/rpm/pysnmp.spec | 10 +-- .../rpm/python-tzlocal.spec | 8 +-- .../rpm/python-vcversioner.spec | 8 +-- .../unibuild-packaging/rpm/python-vine.spec | 8 +-- .../rpm/python-werkzeug.spec | 12 ++-- .../rpm/pscheduler-test-__PLUGIN_NAME__.spec | 4 +- .../rpm/pscheduler-tool-__PLUGIN_NAME__.spec | 2 +- 101 files changed, 307 insertions(+), 307 deletions(-) diff --git a/pscheduler-archiver-bitbucket/bitbucket/unibuild-packaging/rpm/pscheduler-archiver-bitbucket.spec b/pscheduler-archiver-bitbucket/bitbucket/unibuild-packaging/rpm/pscheduler-archiver-bitbucket.spec index db4dc6b3c5..607261b52e 100644 --- a/pscheduler-archiver-bitbucket/bitbucket/unibuild-packaging/rpm/pscheduler-archiver-bitbucket.spec +++ b/pscheduler-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 index 8163c4085f..41ad16f0c6 100644 --- 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 index 4b42cf9931..d0e1b2b38f 100644 --- 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 index 661a12ebcc..bfa3532a41 100644 --- 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 index f50dffac73..78807c0061 100644 --- 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/pscheduler-archiver-postgresql/postgresql/unibuild-packaging/rpm/pscheduler-archiver-postgresql.spec b/pscheduler-archiver-postgresql/postgresql/unibuild-packaging/rpm/pscheduler-archiver-postgresql.spec index 772b077f69..8dc627e5ac 100644 --- a/pscheduler-archiver-postgresql/postgresql/unibuild-packaging/rpm/pscheduler-archiver-postgresql.spec +++ b/pscheduler-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/pscheduler-archiver-rabbitmq/rabbitmq/unibuild-packaging/rpm/pscheduler-archiver-rabbitmq.spec b/pscheduler-archiver-rabbitmq/rabbitmq/unibuild-packaging/rpm/pscheduler-archiver-rabbitmq.spec index eba897bb63..10f7ee1370 100644 --- a/pscheduler-archiver-rabbitmq/rabbitmq/unibuild-packaging/rpm/pscheduler-archiver-rabbitmq.spec +++ b/pscheduler-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/pscheduler-archiver-snmptrap/snmptrap/unibuild-packaging/rpm/pscheduler-archiver-snmptrap.spec b/pscheduler-archiver-snmptrap/snmptrap/unibuild-packaging/rpm/pscheduler-archiver-snmptrap.spec index 18aa1f5487..49181988c0 100644 --- a/pscheduler-archiver-snmptrap/snmptrap/unibuild-packaging/rpm/pscheduler-archiver-snmptrap.spec +++ b/pscheduler-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 index 6a3d6a2e4b..13146f14af 100644 --- 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 index c657251d92..82325a6afe 100644 --- 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/pscheduler-context-changefail/changefail/unibuild-packaging/rpm/pscheduler-context-changefail.spec b/pscheduler-context-changefail/changefail/unibuild-packaging/rpm/pscheduler-context-changefail.spec index 34f2c74c46..f1d8f3ad64 100644 --- a/pscheduler-context-changefail/changefail/unibuild-packaging/rpm/pscheduler-context-changefail.spec +++ b/pscheduler-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/pscheduler-context-changenothing/changenothing/unibuild-packaging/rpm/pscheduler-context-changenothing.spec b/pscheduler-context-changenothing/changenothing/unibuild-packaging/rpm/pscheduler-context-changenothing.spec index 4971d8d504..335fd367be 100644 --- a/pscheduler-context-changenothing/changenothing/unibuild-packaging/rpm/pscheduler-context-changenothing.spec +++ b/pscheduler-context-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 index 38bff4f2fe..4f971bfef7 100644 --- 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 index 323839962a..f46465d161 100644 --- 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 index a676096293..39d4a2db64 100644 --- 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 index cdb4017d7c..06632899ec 100644 --- a/pscheduler-server/pscheduler-server/unibuild-packaging/rpm/pscheduler-server.spec +++ b/pscheduler-server/pscheduler-server/unibuild-packaging/rpm/pscheduler-server.spec @@ -54,15 +54,15 @@ 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 @@ -70,13 +70,13 @@ Requires: httpd-wsgi-socket # 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 index 2dd3cf2882..f8cb2e4a93 100644 --- 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 index e236b6ef7e..6a7b56d59c 100644 --- 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/pscheduler-test-disk-to-disk/disk-to-disk/unibuild-packaging/rpm/pscheduler-test-disk-to-disk.spec b/pscheduler-test-disk-to-disk/disk-to-disk/unibuild-packaging/rpm/pscheduler-test-disk-to-disk.spec index 851390f667..60d482a3ab 100644 --- a/pscheduler-test-disk-to-disk/disk-to-disk/unibuild-packaging/rpm/pscheduler-test-disk-to-disk.spec +++ b/pscheduler-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 index 69a25e4eb4..ef67cae5cc 100644 --- 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 index c93d667bae..db415bf319 100644 --- 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 index f8314a94a3..fe3353dfce 100644 --- 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 index 9615f84f37..5d8d985600 100644 --- 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 index f70a840efd..0f79c909fc 100644 --- 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 index 7d3168b602..ee3be074da 100644 --- 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 diff --git a/pscheduler-test-latency/latency/unibuild-packaging/rpm/pscheduler-test-latency.spec b/pscheduler-test-latency/latency/unibuild-packaging/rpm/pscheduler-test-latency.spec index d5dc22ccd6..36f31ff49a 100644 --- a/pscheduler-test-latency/latency/unibuild-packaging/rpm/pscheduler-test-latency.spec +++ b/pscheduler-test-latency/latency/unibuild-packaging/rpm/pscheduler-test-latency.spec @@ -21,11 +21,11 @@ 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 -BuildRequires: python-pscheduler -BuildRequires: python-nose +BuildRequires: %{_pscheduler_python}-pscheduler +BuildRequires: %{_pscheduler_python}-nose %description Latency test class for pScheduler @@ -39,7 +39,7 @@ Latency test class for pScheduler %build make \ - PYTHON=python \ + PYTHON=%{_pscheduler_python} \ DESTDIR=$RPM_BUILD_ROOT/%{dest} \ install diff --git a/pscheduler-test-latencybg/latencybg/unibuild-packaging/rpm/pscheduler-test-latencybg.spec b/pscheduler-test-latencybg/latencybg/unibuild-packaging/rpm/pscheduler-test-latencybg.spec index 848e262094..9a8203dfba 100644 --- a/pscheduler-test-latencybg/latencybg/unibuild-packaging/rpm/pscheduler-test-latencybg.spec +++ b/pscheduler-test-latencybg/latencybg/unibuild-packaging/rpm/pscheduler-test-latencybg.spec @@ -21,11 +21,11 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server -Requires: python-pscheduler +Requires: %{_pscheduler_python}-pscheduler BuildRequires: pscheduler-rpm -BuildRequires: python-pscheduler -BuildRequires: python-nose +BuildRequires: %{_pscheduler_python}-pscheduler +BuildRequires: %{_pscheduler_python}-nose %description Latency test class for pScheduler that runs in the background. @@ -39,7 +39,7 @@ Latency test class for pScheduler that runs in the background. %build make \ - PYTHON=python \ + PYTHON=%{_pscheduler_python} \ DESTDIR=$RPM_BUILD_ROOT/%{dest} \ install diff --git a/pscheduler-test-mtu/mtu/unibuild-packaging/rpm/pscheduler-test-mtu.spec b/pscheduler-test-mtu/mtu/unibuild-packaging/rpm/pscheduler-test-mtu.spec index 613d45c61a..94ff28ea37 100644 --- a/pscheduler-test-mtu/mtu/unibuild-packaging/rpm/pscheduler-test-mtu.spec +++ b/pscheduler-test-mtu/mtu/unibuild-packaging/rpm/pscheduler-test-mtu.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 @@ MTU test class for pScheduler %build make \ - PYTHON=python \ + PYTHON=%{_pscheduler_python} \ DESTDIR=$RPM_BUILD_ROOT/%{dest} \ install diff --git a/pscheduler-test-netreach/netreach/unibuild-packaging/rpm/pscheduler-test-netreach.spec b/pscheduler-test-netreach/netreach/unibuild-packaging/rpm/pscheduler-test-netreach.spec index 8aafce05c4..de73a75b0b 100644 --- a/pscheduler-test-netreach/netreach/unibuild-packaging/rpm/pscheduler-test-netreach.spec +++ b/pscheduler-test-netreach/netreach/unibuild-packaging/rpm/pscheduler-test-netreach.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 @@ Network reachability test for pScheduler %build make \ - PYTHON=python \ + PYTHON=%{_pscheduler_python} \ DESTDIR=$RPM_BUILD_ROOT/%{dest} \ install diff --git a/pscheduler-test-noop/noop/unibuild-packaging/rpm/pscheduler-test-noop.spec b/pscheduler-test-noop/noop/unibuild-packaging/rpm/pscheduler-test-noop.spec index 5d95b54dc5..2af922b714 100644 --- a/pscheduler-test-noop/noop/unibuild-packaging/rpm/pscheduler-test-noop.spec +++ b/pscheduler-test-noop/noop/unibuild-packaging/rpm/pscheduler-test-noop.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 @@ No-op test class for pScheduler %build make \ - PYTHON=python \ + PYTHON=%{_pscheduler_python} \ DESTDIR=$RPM_BUILD_ROOT/%{dest} \ install diff --git a/pscheduler-test-openports/openports/unibuild-packaging/rpm/pscheduler-test-openports.spec b/pscheduler-test-openports/openports/unibuild-packaging/rpm/pscheduler-test-openports.spec index b1b0e84ee8..f3749cf696 100644 --- a/pscheduler-test-openports/openports/unibuild-packaging/rpm/pscheduler-test-openports.spec +++ b/pscheduler-test-openports/openports/unibuild-packaging/rpm/pscheduler-test-openports.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 @@ openports test class for pScheduler %build make \ - PYTHON=python \ + PYTHON=%{_pscheduler_python} \ DESTDIR=$RPM_BUILD_ROOT/%{dest} \ install diff --git a/pscheduler-test-psresponse/psresponse/unibuild-packaging/rpm/pscheduler-test-psresponse.spec b/pscheduler-test-psresponse/psresponse/unibuild-packaging/rpm/pscheduler-test-psresponse.spec index 83baeb1325..596a61df4f 100644 --- a/pscheduler-test-psresponse/psresponse/unibuild-packaging/rpm/pscheduler-test-psresponse.spec +++ b/pscheduler-test-psresponse/psresponse/unibuild-packaging/rpm/pscheduler-test-psresponse.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 @@ Response test class for pScheduler %build make \ - PYTHON=python \ + PYTHON=%{_pscheduler_python} \ DESTDIR=$RPM_BUILD_ROOT/%{dest} \ install diff --git a/pscheduler-test-rtt/rtt/unibuild-packaging/rpm/pscheduler-test-rtt.spec b/pscheduler-test-rtt/rtt/unibuild-packaging/rpm/pscheduler-test-rtt.spec index 56575761ca..1c4c2a56ed 100644 --- a/pscheduler-test-rtt/rtt/unibuild-packaging/rpm/pscheduler-test-rtt.spec +++ b/pscheduler-test-rtt/rtt/unibuild-packaging/rpm/pscheduler-test-rtt.spec @@ -21,11 +21,11 @@ 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 -BuildRequires: python-pscheduler -BuildRequires: python-nose +BuildRequires: %{_pscheduler_python}-pscheduler +BuildRequires: %{_pscheduler_python}-nose %description Round trip time test class for pScheduler @@ -39,7 +39,7 @@ Round trip time test class for pScheduler %build make \ - PYTHON=python \ + PYTHON=%{_pscheduler_python} \ DESTDIR=$RPM_BUILD_ROOT/%{dest} \ install diff --git a/pscheduler-test-s3throughput/s3throughput/unibuild-packaging/rpm/pscheduler-test-s3throughput.spec b/pscheduler-test-s3throughput/s3throughput/unibuild-packaging/rpm/pscheduler-test-s3throughput.spec index 3c00dda4bc..a4cfee57d4 100644 --- a/pscheduler-test-s3throughput/s3throughput/unibuild-packaging/rpm/pscheduler-test-s3throughput.spec +++ b/pscheduler-test-s3throughput/s3throughput/unibuild-packaging/rpm/pscheduler-test-s3throughput.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 @@ s3throughput test class for pScheduler %build make \ - PYTHON=python \ + PYTHON=%{_pscheduler_python} \ DESTDIR=$RPM_BUILD_ROOT/%{dest} \ install diff --git a/pscheduler-test-simplestream/simplestream/unibuild-packaging/rpm/pscheduler-test-simplestream.spec b/pscheduler-test-simplestream/simplestream/unibuild-packaging/rpm/pscheduler-test-simplestream.spec index 0ced88f111..b8b67c9c77 100644 --- a/pscheduler-test-simplestream/simplestream/unibuild-packaging/rpm/pscheduler-test-simplestream.spec +++ b/pscheduler-test-simplestream/simplestream/unibuild-packaging/rpm/pscheduler-test-simplestream.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.2.6.0 +Requires: %{_pscheduler_python}-pscheduler > 1.3.2.6.0 BuildRequires: pscheduler-rpm @@ -38,7 +38,7 @@ Simplestream test class for pScheduler %build make \ - PYTHON=python \ + PYTHON=%{_pscheduler_python} \ DESTDIR=$RPM_BUILD_ROOT/%{dest} \ install diff --git a/pscheduler-test-snmpget/snmpget/unibuild-packaging/rpm/pscheduler-test-snmpget.spec b/pscheduler-test-snmpget/snmpget/unibuild-packaging/rpm/pscheduler-test-snmpget.spec index 87e9ae413d..3ceaa38ca6 100644 --- a/pscheduler-test-snmpget/snmpget/unibuild-packaging/rpm/pscheduler-test-snmpget.spec +++ b/pscheduler-test-snmpget/snmpget/unibuild-packaging/rpm/pscheduler-test-snmpget.spec @@ -23,7 +23,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 @@ -40,7 +40,7 @@ SNMP test class for pScheduler %build make \ - PYTHON=python \ + PYTHON=%{_pscheduler_python} \ DESTDIR=$RPM_BUILD_ROOT/%{dest} \ install diff --git a/pscheduler-test-snmpgetbgm/snmpgetbgm/unibuild-packaging/rpm/pscheduler-test-snmpgetbgm.spec b/pscheduler-test-snmpgetbgm/snmpgetbgm/unibuild-packaging/rpm/pscheduler-test-snmpgetbgm.spec index f8bfd6808f..7d741c0ef9 100644 --- a/pscheduler-test-snmpgetbgm/snmpgetbgm/unibuild-packaging/rpm/pscheduler-test-snmpgetbgm.spec +++ b/pscheduler-test-snmpgetbgm/snmpgetbgm/unibuild-packaging/rpm/pscheduler-test-snmpgetbgm.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 @@ SNMP test class for pScheduler %build make \ - PYTHON=python \ + PYTHON=%{_pscheduler_python} \ DESTDIR=$RPM_BUILD_ROOT/%{dest} \ install diff --git a/pscheduler-test-snmpset/snmpset/unibuild-packaging/rpm/pscheduler-test-snmpset.spec b/pscheduler-test-snmpset/snmpset/unibuild-packaging/rpm/pscheduler-test-snmpset.spec index b11eeab4fa..177c4bc89e 100644 --- a/pscheduler-test-snmpset/snmpset/unibuild-packaging/rpm/pscheduler-test-snmpset.spec +++ b/pscheduler-test-snmpset/snmpset/unibuild-packaging/rpm/pscheduler-test-snmpset.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 @@ SNMP Set test class for pScheduler %build make \ - PYTHON=python \ + PYTHON=%{_pscheduler_python} \ DESTDIR=$RPM_BUILD_ROOT/%{dest} \ install diff --git a/pscheduler-test-throughput/throughput/unibuild-packaging/rpm/pscheduler-test-throughput.spec b/pscheduler-test-throughput/throughput/unibuild-packaging/rpm/pscheduler-test-throughput.spec index 48a0dc7332..8d6ee7c4e8 100644 --- a/pscheduler-test-throughput/throughput/unibuild-packaging/rpm/pscheduler-test-throughput.spec +++ b/pscheduler-test-throughput/throughput/unibuild-packaging/rpm/pscheduler-test-throughput.spec @@ -21,11 +21,11 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server -Requires: python-pscheduler +Requires: %{_pscheduler_python}-pscheduler BuildRequires: pscheduler-rpm -BuildRequires: python-pscheduler -BuildRequires: python-nose +BuildRequires: %{_pscheduler_python}-pscheduler +BuildRequires: %{_pscheduler_python}-nose %description Throughput test class for pScheduler @@ -39,7 +39,7 @@ Throughput test class for pScheduler %build make \ - PYTHON=python \ + PYTHON=%{_pscheduler_python} \ DESTDIR=$RPM_BUILD_ROOT/%{dest} \ install diff --git a/pscheduler-test-trace/trace/unibuild-packaging/rpm/pscheduler-test-trace.spec b/pscheduler-test-trace/trace/unibuild-packaging/rpm/pscheduler-test-trace.spec index 03d1ea203b..1fa56238f5 100644 --- a/pscheduler-test-trace/trace/unibuild-packaging/rpm/pscheduler-test-trace.spec +++ b/pscheduler-test-trace/trace/unibuild-packaging/rpm/pscheduler-test-trace.spec @@ -21,11 +21,11 @@ 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 -BuildRequires: python-pscheduler -BuildRequires: python-nose +BuildRequires: %{_pscheduler_python}-pscheduler +BuildRequires: %{_pscheduler_python}-nose %description Simplestream test class for pScheduler @@ -39,7 +39,7 @@ Simplestream test class for pScheduler %build make \ - PYTHON=python \ + PYTHON=%{_pscheduler_python} \ DESTDIR=$RPM_BUILD_ROOT/%{dest} \ install diff --git a/pscheduler-test-wifibssid/wifibssid/unibuild-packaging/rpm/pscheduler-test-wifibssid.spec b/pscheduler-test-wifibssid/wifibssid/unibuild-packaging/rpm/pscheduler-test-wifibssid.spec index ec4751a0e8..7bfc207df5 100644 --- a/pscheduler-test-wifibssid/wifibssid/unibuild-packaging/rpm/pscheduler-test-wifibssid.spec +++ b/pscheduler-test-wifibssid/wifibssid/unibuild-packaging/rpm/pscheduler-test-wifibssid.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 @@ wifibssid test class for pScheduler %build make \ - PYTHON=python \ + PYTHON=%{_pscheduler_python} \ DESTDIR=$RPM_BUILD_ROOT/%{dest} \ install diff --git a/pscheduler-tool-bssidscanner/bssidscanner/unibuild-packaging/rpm/pscheduler-tool-bssidscanner.spec b/pscheduler-tool-bssidscanner/bssidscanner/unibuild-packaging/rpm/pscheduler-tool-bssidscanner.spec index b8e656781e..4c7ca4daf0 100644 --- a/pscheduler-tool-bssidscanner/bssidscanner/unibuild-packaging/rpm/pscheduler-tool-bssidscanner.spec +++ b/pscheduler-tool-bssidscanner/bssidscanner/unibuild-packaging/rpm/pscheduler-tool-bssidscanner.spec @@ -27,7 +27,7 @@ Provides: %{name} = %{version}-%{release} # Include all required libraries here Requires: pscheduler-server -Requires: python-pscheduler +Requires: %{_pscheduler_python}-pscheduler BuildRequires: pscheduler-rpm diff --git a/pscheduler-tool-curl-d2d/curl-d2d/unibuild-packaging/rpm/pscheduler-tool-curl-d2d.spec b/pscheduler-tool-curl-d2d/curl-d2d/unibuild-packaging/rpm/pscheduler-tool-curl-d2d.spec index 8b2919a695..1e27ada4d8 100644 --- a/pscheduler-tool-curl-d2d/curl-d2d/unibuild-packaging/rpm/pscheduler-tool-curl-d2d.spec +++ b/pscheduler-tool-curl-d2d/curl-d2d/unibuild-packaging/rpm/pscheduler-tool-curl-d2d.spec @@ -29,8 +29,8 @@ Provides: %{name} = %{version}-%{release} Requires: pscheduler-server >= 4.3.0 Requires: pscheduler-test-http Requires: pscheduler-test-disk-to-disk -Requires: python-pscheduler >= 4.3.0 -Requires: python-pycurl +Requires: %{_pscheduler_python}-pscheduler >= 4.3.0 +Requires: %{_pscheduler_python}-pycurl BuildRequires: pscheduler-rpm @@ -45,7 +45,7 @@ curl tool class for pScheduler %build make \ DESTDIR=$RPM_BUILD_ROOT/%{dest} \ - PYTHON=python \ + PYTHON=%{_pscheduler_python} \ install %post diff --git a/pscheduler-tool-curl/curl/unibuild-packaging/rpm/pscheduler-tool-curl.spec b/pscheduler-tool-curl/curl/unibuild-packaging/rpm/pscheduler-tool-curl.spec index 9e5bfa2ef4..7007e2e7db 100644 --- a/pscheduler-tool-curl/curl/unibuild-packaging/rpm/pscheduler-tool-curl.spec +++ b/pscheduler-tool-curl/curl/unibuild-packaging/rpm/pscheduler-tool-curl.spec @@ -29,8 +29,8 @@ Provides: %{name} = %{version}-%{release} Requires: pscheduler-server >= 4.3.0 Requires: pscheduler-test-http Requires: pscheduler-test-disk-to-disk -Requires: python-pscheduler >= 4.3.0 -Requires: python-pycurl +Requires: %{_pscheduler_python}-pscheduler >= 4.3.0 +Requires: %{_pscheduler_python}-pycurl BuildRequires: pscheduler-rpm @@ -45,7 +45,7 @@ curl tool class for pScheduler %build make \ DESTDIR=$RPM_BUILD_ROOT/%{dest} \ - PYTHON=python \ + PYTHON=%{_pscheduler_python} \ install %post diff --git a/pscheduler-tool-dhclient/dhclient/unibuild-packaging/rpm/pscheduler-tool-dhclient.spec b/pscheduler-tool-dhclient/dhclient/unibuild-packaging/rpm/pscheduler-tool-dhclient.spec index 62b7b6df29..9e91de86f2 100644 --- a/pscheduler-tool-dhclient/dhclient/unibuild-packaging/rpm/pscheduler-tool-dhclient.spec +++ b/pscheduler-tool-dhclient/dhclient/unibuild-packaging/rpm/pscheduler-tool-dhclient.spec @@ -27,7 +27,7 @@ Provides: %{name} = %{version}-%{release} # Include all required libraries here Requires: pscheduler-server -Requires: python-pscheduler +Requires: %{_pscheduler_python}-pscheduler # TODO: Why is there a discrepancy between dhcp-client and dhclient here? @@ -49,7 +49,7 @@ dhclient tool class for pScheduler make \ DESTDIR=$RPM_BUILD_ROOT/%{dest} \ - PYTHON=python \ + PYTHON=%{_pscheduler_python} \ install # Enable sudo for dhclient diff --git a/pscheduler-tool-dnspy/dnspy/unibuild-packaging/rpm/pscheduler-tool-dnspy.spec b/pscheduler-tool-dnspy/dnspy/unibuild-packaging/rpm/pscheduler-tool-dnspy.spec index c69e1de9ff..3d647a420c 100644 --- a/pscheduler-tool-dnspy/dnspy/unibuild-packaging/rpm/pscheduler-tool-dnspy.spec +++ b/pscheduler-tool-dnspy/dnspy/unibuild-packaging/rpm/pscheduler-tool-dnspy.spec @@ -21,8 +21,8 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server >= 4.3.0 -Requires: python-dns -Requires: python-pscheduler +Requires: %{_pscheduler_python}-dns +Requires: %{_pscheduler_python}-pscheduler Requires: pscheduler-test-dns BuildRequires: pscheduler-rpm @@ -40,7 +40,7 @@ DNS tool class for pScheduler %build make \ - PYTHON=python \ + PYTHON=%{_pscheduler_python} \ DESTDIR=$RPM_BUILD_ROOT/%{dest} \ install diff --git a/pscheduler-tool-dublin-traceroute/dublin-traceroute/unibuild-packaging/rpm/pscheduler-tool-dublin-traceroute.spec b/pscheduler-tool-dublin-traceroute/dublin-traceroute/unibuild-packaging/rpm/pscheduler-tool-dublin-traceroute.spec index 8611c22dc0..c0bd1b2b3d 100644 --- a/pscheduler-tool-dublin-traceroute/dublin-traceroute/unibuild-packaging/rpm/pscheduler-tool-dublin-traceroute.spec +++ b/pscheduler-tool-dublin-traceroute/dublin-traceroute/unibuild-packaging/rpm/pscheduler-tool-dublin-traceroute.spec @@ -22,10 +22,10 @@ Provides: %{name} = %{version}-%{release} Requires: pscheduler-server >= 4.3.0 Requires: pscheduler-account -Requires: python-pscheduler >= 4.3.0 +Requires: %{_pscheduler_python}-pscheduler >= 4.3.0 Requires: pscheduler-test-trace Requires: dublin-traceroute >= 0.4.2 -Requires: python-icmperror +Requires: %{_pscheduler_python}-icmperror BuildRequires: pscheduler-account BuildRequires: pscheduler-rpm diff --git a/pscheduler-tool-ethr/ethr/unibuild-packaging/rpm/pscheduler-tool-ethr.spec b/pscheduler-tool-ethr/ethr/unibuild-packaging/rpm/pscheduler-tool-ethr.spec index 940ce596fa..75770f2b60 100644 --- a/pscheduler-tool-ethr/ethr/unibuild-packaging/rpm/pscheduler-tool-ethr.spec +++ b/pscheduler-tool-ethr/ethr/unibuild-packaging/rpm/pscheduler-tool-ethr.spec @@ -27,7 +27,7 @@ Provides: %{name} = %{version}-%{release} # Include all required libraries here Requires: pscheduler-server -Requires: python-pscheduler +Requires: %{_pscheduler_python}-pscheduler Requires: ethr >= 0.2.1 BuildRequires: pscheduler-rpm diff --git a/pscheduler-tool-fpingreach/fpingreach/unibuild-packaging/rpm/pscheduler-tool-fpingreach.spec b/pscheduler-tool-fpingreach/fpingreach/unibuild-packaging/rpm/pscheduler-tool-fpingreach.spec index e8b2ce93dd..38f01473da 100644 --- a/pscheduler-tool-fpingreach/fpingreach/unibuild-packaging/rpm/pscheduler-tool-fpingreach.spec +++ b/pscheduler-tool-fpingreach/fpingreach/unibuild-packaging/rpm/pscheduler-tool-fpingreach.spec @@ -21,7 +21,7 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server >= 4.3.0 -Requires: python-pscheduler >= 4.3.0 +Requires: %{_pscheduler_python}-pscheduler >= 4.3.0 Requires: pscheduler-test-netreach Requires: fping diff --git a/pscheduler-tool-fwmtu/fwmtu/unibuild-packaging/rpm/pscheduler-tool-fwmtu.spec b/pscheduler-tool-fwmtu/fwmtu/unibuild-packaging/rpm/pscheduler-tool-fwmtu.spec index 8b558ff709..d82ca08769 100644 --- a/pscheduler-tool-fwmtu/fwmtu/unibuild-packaging/rpm/pscheduler-tool-fwmtu.spec +++ b/pscheduler-tool-fwmtu/fwmtu/unibuild-packaging/rpm/pscheduler-tool-fwmtu.spec @@ -27,7 +27,7 @@ Provides: %{name} = %{version}-%{release} # Include all required libraries here Requires: pscheduler-server -Requires: python-pscheduler +Requires: %{_pscheduler_python}-pscheduler BuildRequires: pscheduler-rpm diff --git a/pscheduler-tool-globus/globus/unibuild-packaging/rpm/pscheduler-tool-globus.spec b/pscheduler-tool-globus/globus/unibuild-packaging/rpm/pscheduler-tool-globus.spec index b39e3c1aeb..8cb05ca8b3 100644 --- a/pscheduler-tool-globus/globus/unibuild-packaging/rpm/pscheduler-tool-globus.spec +++ b/pscheduler-tool-globus/globus/unibuild-packaging/rpm/pscheduler-tool-globus.spec @@ -27,7 +27,7 @@ Provides: %{name} = %{version}-%{release} # Include all required libraries here Requires: pscheduler-server >= 4.3.0 -Requires: python-pscheduler >= 4.3.0 +Requires: %{_pscheduler_python}-pscheduler >= 4.3.0 BuildRequires: pscheduler-rpm diff --git a/pscheduler-tool-halfping/halfping/unibuild-packaging/rpm/pscheduler-tool-halfping.spec b/pscheduler-tool-halfping/halfping/unibuild-packaging/rpm/pscheduler-tool-halfping.spec index 026576fc7d..304d5eb7cf 100644 --- a/pscheduler-tool-halfping/halfping/unibuild-packaging/rpm/pscheduler-tool-halfping.spec +++ b/pscheduler-tool-halfping/halfping/unibuild-packaging/rpm/pscheduler-tool-halfping.spec @@ -27,7 +27,7 @@ Provides: %{name} = %{version}-%{release} # Include all required libraries here Requires: pscheduler-server -Requires: python-pscheduler >= 5.0.0 +Requires: %{_pscheduler_python}-pscheduler >= 5.0.0 BuildRequires: pscheduler-rpm diff --git a/pscheduler-tool-iperf2/iperf2/unibuild-packaging/rpm/pscheduler-tool-iperf2.spec b/pscheduler-tool-iperf2/iperf2/unibuild-packaging/rpm/pscheduler-tool-iperf2.spec index 82ac8bfb04..e99ff6a9a2 100644 --- a/pscheduler-tool-iperf2/iperf2/unibuild-packaging/rpm/pscheduler-tool-iperf2.spec +++ b/pscheduler-tool-iperf2/iperf2/unibuild-packaging/rpm/pscheduler-tool-iperf2.spec @@ -21,7 +21,7 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server >= 4.3.0 -Requires: python-pscheduler >= 4.3.0 +Requires: %{_pscheduler_python}-pscheduler >= 4.3.0 Requires: pscheduler-test-throughput requires: iperf >= 2.1.9 @@ -40,7 +40,7 @@ iperf2 tool class for pScheduler %build make \ - PYTHON=python \ + PYTHON=%{_pscheduler_python} \ DESTDIR=$RPM_BUILD_ROOT/%{dest} \ CONFDIR=$RPM_BUILD_ROOT/%{_pscheduler_tool_confdir}\ install diff --git a/pscheduler-tool-iperf3/iperf3/unibuild-packaging/rpm/pscheduler-tool-iperf3.spec b/pscheduler-tool-iperf3/iperf3/unibuild-packaging/rpm/pscheduler-tool-iperf3.spec index 9b00579995..9542a7b488 100644 --- a/pscheduler-tool-iperf3/iperf3/unibuild-packaging/rpm/pscheduler-tool-iperf3.spec +++ b/pscheduler-tool-iperf3/iperf3/unibuild-packaging/rpm/pscheduler-tool-iperf3.spec @@ -21,8 +21,8 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server >= 4.4.0 -Requires: python-pscheduler >= 4.4.1 -Requires: python-cryptography +Requires: %{_pscheduler_python}-pscheduler >= 4.4.1 +Requires: %{_pscheduler_python}-cryptography Requires: pscheduler-test-throughput requires: iperf3 >= 3.11 Requires: numactl @@ -42,7 +42,7 @@ iperf3 tool class for pScheduler %build make \ - PYTHON=python \ + PYTHON=%{_pscheduler_python} \ DESTDIR=$RPM_BUILD_ROOT/%{dest} \ CONFDIR=$RPM_BUILD_ROOT/%{_pscheduler_tool_confdir}\ install diff --git a/pscheduler-tool-net-snmp-set/net-snmp-set/unibuild-packaging/rpm/pscheduler-tool-net-snmp-set.spec b/pscheduler-tool-net-snmp-set/net-snmp-set/unibuild-packaging/rpm/pscheduler-tool-net-snmp-set.spec index 4b04a5a0bc..072b72cb43 100644 --- a/pscheduler-tool-net-snmp-set/net-snmp-set/unibuild-packaging/rpm/pscheduler-tool-net-snmp-set.spec +++ b/pscheduler-tool-net-snmp-set/net-snmp-set/unibuild-packaging/rpm/pscheduler-tool-net-snmp-set.spec @@ -22,7 +22,7 @@ Provides: %{name} = %{version}-%{release} Requires: pscheduler-server >= 4.3.0 Requires: net-snmp -Requires: python-pscheduler >= 4.3.0 +Requires: %{_pscheduler_python}-pscheduler >= 4.3.0 Requires: pscheduler-test-snmpset BuildRequires: pscheduler-rpm diff --git a/pscheduler-tool-nmapreach/nmapreach/unibuild-packaging/rpm/pscheduler-tool-nmapreach.spec b/pscheduler-tool-nmapreach/nmapreach/unibuild-packaging/rpm/pscheduler-tool-nmapreach.spec index 2ea39835e0..6ee0d993fd 100644 --- a/pscheduler-tool-nmapreach/nmapreach/unibuild-packaging/rpm/pscheduler-tool-nmapreach.spec +++ b/pscheduler-tool-nmapreach/nmapreach/unibuild-packaging/rpm/pscheduler-tool-nmapreach.spec @@ -21,7 +21,7 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server >= 4.3.0 -Requires: python-pscheduler >= 4.3.0 +Requires: %{_pscheduler_python}-pscheduler >= 4.3.0 Requires: pscheduler-test-netreach Requires: nmap diff --git a/pscheduler-tool-nmapscan/nmapscan/unibuild-packaging/rpm/pscheduler-tool-nmapscan.spec b/pscheduler-tool-nmapscan/nmapscan/unibuild-packaging/rpm/pscheduler-tool-nmapscan.spec index b8b31187fb..6d7d126a32 100644 --- a/pscheduler-tool-nmapscan/nmapscan/unibuild-packaging/rpm/pscheduler-tool-nmapscan.spec +++ b/pscheduler-tool-nmapscan/nmapscan/unibuild-packaging/rpm/pscheduler-tool-nmapscan.spec @@ -27,8 +27,8 @@ Provides: %{name} = %{version}-%{release} # Include all required libraries here Requires: pscheduler-server -Requires: python-pscheduler -Requires: python-nmap3 +Requires: %{_pscheduler_python}-pscheduler +Requires: %{_pscheduler_python}-nmap3 BuildRequires: pscheduler-rpm diff --git a/pscheduler-tool-nuttcp/nuttcp/unibuild-packaging/rpm/pscheduler-tool-nuttcp.spec b/pscheduler-tool-nuttcp/nuttcp/unibuild-packaging/rpm/pscheduler-tool-nuttcp.spec index 0dcaefcfa6..c627e1dd1f 100644 --- a/pscheduler-tool-nuttcp/nuttcp/unibuild-packaging/rpm/pscheduler-tool-nuttcp.spec +++ b/pscheduler-tool-nuttcp/nuttcp/unibuild-packaging/rpm/pscheduler-tool-nuttcp.spec @@ -21,7 +21,7 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server >= 4.4.0 -Requires: python-pscheduler >= 4.4.0 +Requires: %{_pscheduler_python}-pscheduler >= 4.4.0 Requires: pscheduler-test-throughput Requires: numactl Requires: nuttcp >= 8.1.4 @@ -41,7 +41,7 @@ nuttcp tool class for pScheduler %build make \ - PYTHON=python \ + PYTHON=%{_pscheduler_python} \ DESTDIR=$RPM_BUILD_ROOT/%{dest} \ CONFDIR=$RPM_BUILD_ROOT/%{_pscheduler_tool_confdir}\ install diff --git a/pscheduler-tool-owping/owping/unibuild-packaging/rpm/pscheduler-tool-owping.spec b/pscheduler-tool-owping/owping/unibuild-packaging/rpm/pscheduler-tool-owping.spec index 85114b2462..5e0c2d4f57 100644 --- a/pscheduler-tool-owping/owping/unibuild-packaging/rpm/pscheduler-tool-owping.spec +++ b/pscheduler-tool-owping/owping/unibuild-packaging/rpm/pscheduler-tool-owping.spec @@ -21,14 +21,14 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server >= 4.3.0 -Requires: python-pscheduler >= 4.3.0 +Requires: %{_pscheduler_python}-pscheduler >= 4.3.0 Requires: pscheduler-test-latency Requires: owamp-client Requires: owamp-server BuildRequires: pscheduler-rpm -BuildRequires: python-pscheduler -BuildRequires: python-nose +BuildRequires: %{_pscheduler_python}-pscheduler +BuildRequires: %{_pscheduler_python}-nose %description owping tool class for pScheduler @@ -42,7 +42,7 @@ owping tool class for pScheduler %build make \ - PYTHON=python \ + PYTHON=%{_pscheduler_python} \ DESTDIR=$RPM_BUILD_ROOT/%{dest} \ CONFDIR=$RPM_BUILD_ROOT/%{_pscheduler_tool_confdir}\ install diff --git a/pscheduler-tool-paris-traceroute/paris-traceroute/unibuild-packaging/rpm/pscheduler-tool-paris-traceroute.spec b/pscheduler-tool-paris-traceroute/paris-traceroute/unibuild-packaging/rpm/pscheduler-tool-paris-traceroute.spec index ec3723385c..906db87d23 100644 --- a/pscheduler-tool-paris-traceroute/paris-traceroute/unibuild-packaging/rpm/pscheduler-tool-paris-traceroute.spec +++ b/pscheduler-tool-paris-traceroute/paris-traceroute/unibuild-packaging/rpm/pscheduler-tool-paris-traceroute.spec @@ -22,11 +22,11 @@ Provides: %{name} = %{version}-%{release} Requires: pscheduler-server >= 4.3.0 Requires: pscheduler-account -Requires: python-pscheduler >= 4.3.0 +Requires: %{_pscheduler_python}-pscheduler >= 4.3.0 Requires: pscheduler-test-trace Requires: paris-traceroute Requires: sudo -Requires: python-icmperror +Requires: %{_pscheduler_python}-icmperror BuildRequires: pscheduler-account BuildRequires: pscheduler-rpm diff --git a/pscheduler-tool-passthrough/passthrough/unibuild-packaging/rpm/pscheduler-tool-passthrough.spec b/pscheduler-tool-passthrough/passthrough/unibuild-packaging/rpm/pscheduler-tool-passthrough.spec index 20c78bcc19..1de3c10813 100644 --- a/pscheduler-tool-passthrough/passthrough/unibuild-packaging/rpm/pscheduler-tool-passthrough.spec +++ b/pscheduler-tool-passthrough/passthrough/unibuild-packaging/rpm/pscheduler-tool-passthrough.spec @@ -21,7 +21,7 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server >= 4.3.0 -Requires: python-pscheduler >= 4.3.0 +Requires: %{_pscheduler_python}-pscheduler >= 4.3.0 Requires: pscheduler-test-idle BuildRequires: pscheduler-rpm diff --git a/pscheduler-tool-ping/ping/unibuild-packaging/rpm/pscheduler-tool-ping.spec b/pscheduler-tool-ping/ping/unibuild-packaging/rpm/pscheduler-tool-ping.spec index 2040fba82f..c4cd19489f 100644 --- a/pscheduler-tool-ping/ping/unibuild-packaging/rpm/pscheduler-tool-ping.spec +++ b/pscheduler-tool-ping/ping/unibuild-packaging/rpm/pscheduler-tool-ping.spec @@ -24,9 +24,9 @@ Provides: %{name} = %{version}-%{release} Requires: pscheduler-server >= 4.3.0 Requires: pscheduler-account -Requires: python-pscheduler >= 4.3.0 +Requires: %{_pscheduler_python}-pscheduler >= 4.3.0 Requires: pscheduler-test-rtt -Requires: python-icmperror +Requires: %{_pscheduler_python}-icmperror # This supplies ping. Requires: iputils Requires: sudo diff --git a/pscheduler-tool-powstream/powstream/unibuild-packaging/rpm/pscheduler-tool-powstream.spec b/pscheduler-tool-powstream/powstream/unibuild-packaging/rpm/pscheduler-tool-powstream.spec index 734cb5174c..71800bfd9e 100644 --- a/pscheduler-tool-powstream/powstream/unibuild-packaging/rpm/pscheduler-tool-powstream.spec +++ b/pscheduler-tool-powstream/powstream/unibuild-packaging/rpm/pscheduler-tool-powstream.spec @@ -23,14 +23,14 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server >= 4.3.0 -Requires: python-pscheduler >= 4.3.0 +Requires: %{_pscheduler_python}-pscheduler >= 4.3.0 Requires: pscheduler-test-latencybg Requires: owamp-client Requires: owamp-server BuildRequires: pscheduler-rpm -BuildRequires: python-pscheduler -BuildRequires: python-nose +BuildRequires: %{_pscheduler_python}-pscheduler +BuildRequires: %{_pscheduler_python}-nose %description powstream tool class for pScheduler @@ -44,7 +44,7 @@ powstream tool class for pScheduler %build make \ - PYTHON=python \ + PYTHON=%{_pscheduler_python} \ DESTDIR=$RPM_BUILD_ROOT/%{dest} \ CONFDIR=$RPM_BUILD_ROOT/%{_pscheduler_tool_confdir}\ install diff --git a/pscheduler-tool-psclock/psclock/unibuild-packaging/rpm/pscheduler-tool-psclock.spec b/pscheduler-tool-psclock/psclock/unibuild-packaging/rpm/pscheduler-tool-psclock.spec index a3723200dd..ff4913174e 100644 --- a/pscheduler-tool-psclock/psclock/unibuild-packaging/rpm/pscheduler-tool-psclock.spec +++ b/pscheduler-tool-psclock/psclock/unibuild-packaging/rpm/pscheduler-tool-psclock.spec @@ -21,7 +21,7 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server >= 4.3.0 -Requires: python-pscheduler >= 4.3.0 +Requires: %{_pscheduler_python}-pscheduler >= 4.3.0 Requires: pscheduler-test-clock BuildRequires: pscheduler-rpm diff --git a/pscheduler-tool-pstimer/pstimer/unibuild-packaging/rpm/pscheduler-tool-pstimer.spec b/pscheduler-tool-pstimer/pstimer/unibuild-packaging/rpm/pscheduler-tool-pstimer.spec index b2cbd14993..5b44d41aff 100644 --- a/pscheduler-tool-pstimer/pstimer/unibuild-packaging/rpm/pscheduler-tool-pstimer.spec +++ b/pscheduler-tool-pstimer/pstimer/unibuild-packaging/rpm/pscheduler-tool-pstimer.spec @@ -28,8 +28,8 @@ Provides: %{name} = %{version}-%{release} # Include all required libraries here Requires: pscheduler-server >= 4.3.0 Requires: pscheduler-test-psresponse -Requires: python-pscheduler >= 4.3.0 -Requires: python-pycurl +Requires: %{_pscheduler_python}-pscheduler >= 4.3.0 +Requires: %{_pscheduler_python}-pycurl BuildRequires: pscheduler-rpm @@ -44,7 +44,7 @@ pstimer tool class for pScheduler %build make \ DESTDIR=$RPM_BUILD_ROOT/%{dest} \ - PYTHON=python \ + PYTHON=%{_pscheduler_python} \ install %post diff --git a/pscheduler-tool-psurl/psurl/unibuild-packaging/rpm/pscheduler-tool-psurl.spec b/pscheduler-tool-psurl/psurl/unibuild-packaging/rpm/pscheduler-tool-psurl.spec index 75920df446..bfba0057ee 100644 --- a/pscheduler-tool-psurl/psurl/unibuild-packaging/rpm/pscheduler-tool-psurl.spec +++ b/pscheduler-tool-psurl/psurl/unibuild-packaging/rpm/pscheduler-tool-psurl.spec @@ -21,7 +21,7 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server >= 4.3.0 -Requires: python-pscheduler >= 4.3.0 +Requires: %{_pscheduler_python}-pscheduler >= 4.3.0 Requires: pscheduler-test-http BuildRequires: pscheduler-rpm diff --git a/pscheduler-tool-pysnmp/pysnmp/unibuild-packaging/rpm/pscheduler-tool-pysnmp.spec b/pscheduler-tool-pysnmp/pysnmp/unibuild-packaging/rpm/pscheduler-tool-pysnmp.spec index c87c58f564..4e591efd6a 100644 --- a/pscheduler-tool-pysnmp/pysnmp/unibuild-packaging/rpm/pscheduler-tool-pysnmp.spec +++ b/pscheduler-tool-pysnmp/pysnmp/unibuild-packaging/rpm/pscheduler-tool-pysnmp.spec @@ -21,8 +21,8 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server >= 4.3.0 -Requires: python-pscheduler >= 4.3.0 -Requires: python-pysnmp +Requires: %{_pscheduler_python}-pscheduler >= 4.3.0 +Requires: %{_pscheduler_python}-pysnmp BuildRequires: pscheduler-rpm diff --git a/pscheduler-tool-s3-benchmark/s3-benchmark/unibuild-packaging/rpm/pscheduler-tool-s3-benchmark.spec b/pscheduler-tool-s3-benchmark/s3-benchmark/unibuild-packaging/rpm/pscheduler-tool-s3-benchmark.spec index a0e4350046..9cbbb560f8 100644 --- a/pscheduler-tool-s3-benchmark/s3-benchmark/unibuild-packaging/rpm/pscheduler-tool-s3-benchmark.spec +++ b/pscheduler-tool-s3-benchmark/s3-benchmark/unibuild-packaging/rpm/pscheduler-tool-s3-benchmark.spec @@ -27,7 +27,7 @@ Provides: %{name} = %{version}-%{release} # Include all required libraries here Requires: pscheduler-server -Requires: python-pscheduler +Requires: %{_pscheduler_python}-pscheduler Requires: s3-benchmark Requires: pscheduler-test-s3throughput diff --git a/pscheduler-tool-simplestreamer/simplestreamer/unibuild-packaging/rpm/pscheduler-tool-simplestreamer.spec b/pscheduler-tool-simplestreamer/simplestreamer/unibuild-packaging/rpm/pscheduler-tool-simplestreamer.spec index b7687ff007..39488c2ef7 100644 --- a/pscheduler-tool-simplestreamer/simplestreamer/unibuild-packaging/rpm/pscheduler-tool-simplestreamer.spec +++ b/pscheduler-tool-simplestreamer/simplestreamer/unibuild-packaging/rpm/pscheduler-tool-simplestreamer.spec @@ -21,7 +21,7 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server >= 4.3.0 -Requires: python-pscheduler >= 4.3.0 +Requires: %{_pscheduler_python}-pscheduler >= 4.3.0 Requires: pscheduler-test-simplestream >= 1.0.2.6.1 BuildRequires: pscheduler-rpm diff --git a/pscheduler-tool-sleep/sleep/unibuild-packaging/rpm/pscheduler-tool-sleep.spec b/pscheduler-tool-sleep/sleep/unibuild-packaging/rpm/pscheduler-tool-sleep.spec index 494e7ad280..280f9e720a 100644 --- a/pscheduler-tool-sleep/sleep/unibuild-packaging/rpm/pscheduler-tool-sleep.spec +++ b/pscheduler-tool-sleep/sleep/unibuild-packaging/rpm/pscheduler-tool-sleep.spec @@ -21,7 +21,7 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server >= 4.3.0 -Requires: python-pscheduler >= 4.3.0 +Requires: %{_pscheduler_python}-pscheduler >= 4.3.0 Requires: pscheduler-test-idle BuildRequires: pscheduler-rpm diff --git a/pscheduler-tool-sleepbgm/sleepbgm/unibuild-packaging/rpm/pscheduler-tool-sleepbgm.spec b/pscheduler-tool-sleepbgm/sleepbgm/unibuild-packaging/rpm/pscheduler-tool-sleepbgm.spec index 8a5e819db3..b7a13f6e2f 100644 --- a/pscheduler-tool-sleepbgm/sleepbgm/unibuild-packaging/rpm/pscheduler-tool-sleepbgm.spec +++ b/pscheduler-tool-sleepbgm/sleepbgm/unibuild-packaging/rpm/pscheduler-tool-sleepbgm.spec @@ -21,7 +21,7 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server >= 4.3.0 -Requires: python-pscheduler >= 4.3.0 +Requires: %{_pscheduler_python}-pscheduler >= 4.3.0 Requires: pscheduler-test-idlebgm BuildRequires: pscheduler-rpm diff --git a/pscheduler-tool-snooze/snooze/unibuild-packaging/rpm/pscheduler-tool-snooze.spec b/pscheduler-tool-snooze/snooze/unibuild-packaging/rpm/pscheduler-tool-snooze.spec index 788ace5c51..1e565c27e0 100644 --- a/pscheduler-tool-snooze/snooze/unibuild-packaging/rpm/pscheduler-tool-snooze.spec +++ b/pscheduler-tool-snooze/snooze/unibuild-packaging/rpm/pscheduler-tool-snooze.spec @@ -21,7 +21,7 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server >= 4.3.0 -Requires: python-pscheduler >= 4.3.0 +Requires: %{_pscheduler_python}-pscheduler >= 4.3.0 Requires: pscheduler-test-idle BuildRequires: pscheduler-rpm diff --git a/pscheduler-tool-tcpping/tcpping/unibuild-packaging/rpm/pscheduler-tool-tcpping.spec b/pscheduler-tool-tcpping/tcpping/unibuild-packaging/rpm/pscheduler-tool-tcpping.spec index f8cea086dc..bf3871544f 100644 --- a/pscheduler-tool-tcpping/tcpping/unibuild-packaging/rpm/pscheduler-tool-tcpping.spec +++ b/pscheduler-tool-tcpping/tcpping/unibuild-packaging/rpm/pscheduler-tool-tcpping.spec @@ -22,9 +22,9 @@ Provides: %{name} = %{version}-%{release} Requires: pscheduler-server >= 4.3.0 Requires: pscheduler-account -Requires: python-pscheduler >= 4.3.0 +Requires: %{_pscheduler_python}-pscheduler >= 4.3.0 Requires: pscheduler-test-rtt -Requires: python-icmperror +Requires: %{_pscheduler_python}-icmperror Requires: tcpping BuildRequires: pscheduler-account diff --git a/pscheduler-tool-tracepath/tracepath/unibuild-packaging/rpm/pscheduler-tool-tracepath.spec b/pscheduler-tool-tracepath/tracepath/unibuild-packaging/rpm/pscheduler-tool-tracepath.spec index 699a1c897e..fecdac0450 100644 --- a/pscheduler-tool-tracepath/tracepath/unibuild-packaging/rpm/pscheduler-tool-tracepath.spec +++ b/pscheduler-tool-tracepath/tracepath/unibuild-packaging/rpm/pscheduler-tool-tracepath.spec @@ -21,9 +21,9 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server >= 4.3.0 -Requires: python-pscheduler >= 4.3.0 +Requires: %{_pscheduler_python}-pscheduler >= 4.3.0 Requires: pscheduler-test-trace -Requires: python-icmperror +Requires: %{_pscheduler_python}-icmperror Requires: iputils BuildRequires: pscheduler-rpm diff --git a/pscheduler-tool-traceroute/traceroute/unibuild-packaging/rpm/pscheduler-tool-traceroute.spec b/pscheduler-tool-traceroute/traceroute/unibuild-packaging/rpm/pscheduler-tool-traceroute.spec index 6a2bd82652..4436652d1e 100644 --- a/pscheduler-tool-traceroute/traceroute/unibuild-packaging/rpm/pscheduler-tool-traceroute.spec +++ b/pscheduler-tool-traceroute/traceroute/unibuild-packaging/rpm/pscheduler-tool-traceroute.spec @@ -22,9 +22,9 @@ Provides: %{name} = %{version}-%{release} Requires: pscheduler-server >= 4.3.0 Requires: pscheduler-account -Requires: python-pscheduler >= 4.3.0 +Requires: %{_pscheduler_python}-pscheduler >= 4.3.0 Requires: pscheduler-test-trace -Requires: python-icmperror +Requires: %{_pscheduler_python}-icmperror Requires: traceroute Requires: sudo diff --git a/pscheduler-tool-twping/twping/unibuild-packaging/rpm/pscheduler-tool-twping.spec b/pscheduler-tool-twping/twping/unibuild-packaging/rpm/pscheduler-tool-twping.spec index b3fcb665b1..137cd41bf0 100644 --- a/pscheduler-tool-twping/twping/unibuild-packaging/rpm/pscheduler-tool-twping.spec +++ b/pscheduler-tool-twping/twping/unibuild-packaging/rpm/pscheduler-tool-twping.spec @@ -21,13 +21,13 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server >= 4.3.0 -Requires: python-pscheduler >= 4.3.0 +Requires: %{_pscheduler_python}-pscheduler >= 4.3.0 Requires: pscheduler-test-latency Requires: twamp-client BuildRequires: pscheduler-rpm -BuildRequires: python-pscheduler -BuildRequires: python-nose +BuildRequires: %{_pscheduler_python}-pscheduler +BuildRequires: %{_pscheduler_python}-nose %description twping tool class for pScheduler @@ -41,7 +41,7 @@ twping tool class for pScheduler %build make \ - PYTHON=python \ + PYTHON=%{_pscheduler_python} \ DESTDIR=$RPM_BUILD_ROOT/%{dest} \ CONFDIR=$RPM_BUILD_ROOT/%{_pscheduler_tool_confdir}\ install diff --git a/pscheduler-tool-umichwpa/umichwpa/unibuild-packaging/rpm/pscheduler-tool-umichwpa.spec b/pscheduler-tool-umichwpa/umichwpa/unibuild-packaging/rpm/pscheduler-tool-umichwpa.spec index 0caa5d895a..1751e55743 100644 --- a/pscheduler-tool-umichwpa/umichwpa/unibuild-packaging/rpm/pscheduler-tool-umichwpa.spec +++ b/pscheduler-tool-umichwpa/umichwpa/unibuild-packaging/rpm/pscheduler-tool-umichwpa.spec @@ -27,7 +27,7 @@ Provides: %{name} = %{version}-%{release} # Include all required libraries here Requires: pscheduler-server -Requires: python-pscheduler +Requires: %{_pscheduler_python}-pscheduler BuildRequires: pscheduler-rpm diff --git a/python-daemon/unibuild-packaging/rpm/python-daemon.spec b/python-daemon/unibuild-packaging/rpm/python-daemon.spec index bfe281ad5d..6f81881881 100644 --- a/python-daemon/unibuild-packaging/rpm/python-daemon.spec +++ b/python-daemon/unibuild-packaging/rpm/python-daemon.spec @@ -3,7 +3,7 @@ # %define short daemon -Name: python-%{short} +Name: %{_pscheduler_python}-%{short} Version: 2.2.3 Release: 1%{?dist} Summary: Daemonizer library for Python @@ -19,13 +19,13 @@ Url: https://pagure.io/python-daemon Source: python-%{short}-%{version}.tar.gz -Requires: python +Requires: %{_pscheduler_python} -BuildRequires: python -BuildRequires: python-pip -BuildRequires: python-setuptools -BuildRequires: python-wheel -BuildRequires: python-docutils +BuildRequires: %{_pscheduler_python} +BuildRequires: %{_pscheduler_python}-pip +BuildRequires: %{_pscheduler_python}-setuptools +BuildRequires: %{_pscheduler_python}-wheel +BuildRequires: %{_pscheduler_python}-docutils %description Daemonizer library for Python diff --git a/python-flask/unibuild-packaging/rpm/python-flask.spec b/python-flask/unibuild-packaging/rpm/python-flask.spec index efc07cb792..247a1f0f77 100644 --- a/python-flask/unibuild-packaging/rpm/python-flask.spec +++ b/python-flask/unibuild-packaging/rpm/python-flask.spec @@ -3,7 +3,7 @@ # %define short flask -Name: python-%{short} +Name: %{_pscheduler_python}-%{short} Version: 1.1.1 Release: 1%{?dist} Summary: A micro-framework for Python based on Werkzeug, Jinja 2 and good intentions @@ -19,14 +19,14 @@ URL: https://palletsprojects.com/p/flask Source: %{short}-%{version}.tar.gz -Requires: python -Requires: python-click -Requires: python-jinja2 -Requires: python-itsdangerous -Requires: python-werkzeug +Requires: %{_pscheduler_python} +Requires: %{_pscheduler_python}-click +Requires: %{_pscheduler_python}-jinja2 +Requires: %{_pscheduler_python}-itsdangerous +Requires: %{_pscheduler_python}-werkzeug -BuildRequires: python -BuildRequires: python-setuptools +BuildRequires: %{_pscheduler_python} +BuildRequires: %{_pscheduler_python}-setuptools %description Flask is called a “micro-framework” because the idea to keep the core diff --git a/python-icmperror/icmperror/unibuild-packaging/rpm/python-icmperror.spec b/python-icmperror/icmperror/unibuild-packaging/rpm/python-icmperror.spec index d5168160f7..9b8cd1ab27 100644 --- a/python-icmperror/icmperror/unibuild-packaging/rpm/python-icmperror.spec +++ b/python-icmperror/icmperror/unibuild-packaging/rpm/python-icmperror.spec @@ -3,7 +3,7 @@ # %define short icmperror -Name: python-%{short} +Name: %{_pscheduler_python}-%{short} Version: 0.1 Release: 1%{?dist} Summary: Functions for translating ICMP error codes to enumerated values @@ -19,10 +19,10 @@ Url: http://www.perfsonar.net Source0: %{short}-%{version}.tar.gz -Requires: python +Requires: %{_pscheduler_python} -BuildRequires: python -BuildRequires: python-setuptools +BuildRequires: %{_pscheduler_python} +BuildRequires: %{_pscheduler_python}-setuptools %description diff --git a/python-itsdangerous/unibuild-packaging/rpm/python-itsdangerous.spec b/python-itsdangerous/unibuild-packaging/rpm/python-itsdangerous.spec index 92642a023b..c5362e6a1d 100644 --- a/python-itsdangerous/unibuild-packaging/rpm/python-itsdangerous.spec +++ b/python-itsdangerous/unibuild-packaging/rpm/python-itsdangerous.spec @@ -3,7 +3,7 @@ # %define short itsdangerous -Name: python-%{short} +Name: %{_pscheduler_python}-%{short} Version: 1.1.0 Release: 1%{?dist} Summary: JSON Signature Module @@ -19,10 +19,10 @@ URL: https://palletsprojects.com/p/itsdangerous Source: %{short}-%{version}.tar.gz -Requires: python +Requires: %{_pscheduler_python} -BuildRequires: python -BuildRequires: python-setuptools +BuildRequires: %{_pscheduler_python} +BuildRequires: %{_pscheduler_python}-setuptools %description diff --git a/python-jsonschema/unibuild-packaging/rpm/python-jsonschema.spec b/python-jsonschema/unibuild-packaging/rpm/python-jsonschema.spec index 5b848f184e..e758bef72b 100644 --- a/python-jsonschema/unibuild-packaging/rpm/python-jsonschema.spec +++ b/python-jsonschema/unibuild-packaging/rpm/python-jsonschema.spec @@ -3,7 +3,7 @@ # %define short jsonschema -Name: python-%{short} +Name: %{_pscheduler_python}-%{short} Version: 3.0.1 Release: 1%{?dist} Summary: JSON Schema library for Python @@ -21,13 +21,13 @@ URL: http://pypi.python.org/pypi/jsonschema Source: %{short}-%{version}.tar.gz -Requires: python -Requires: python-pyrsistent +Requires: %{_pscheduler_python} +Requires: %{_pscheduler_python}-pyrsistent # This is required for some reason. -Requires: python-setuptools +Requires: %{_pscheduler_python}-setuptools -BuildRequires: python -BuildRequires: python-setuptools +BuildRequires: %{_pscheduler_python} +BuildRequires: %{_pscheduler_python}-setuptools %description diff --git a/python-kafka/unibuild-packaging/rpm/python-kafka.spec b/python-kafka/unibuild-packaging/rpm/python-kafka.spec index 7c92caa8c9..57c1fdcaa2 100644 --- a/python-kafka/unibuild-packaging/rpm/python-kafka.spec +++ b/python-kafka/unibuild-packaging/rpm/python-kafka.spec @@ -3,7 +3,7 @@ # %define short kafka -Name: python-%{short} +Name: %{_pscheduler_python}-%{short} Version: 2.0.2 Release: 1%{?dist} Summary: A pure Python library for Apache Kafka @@ -19,10 +19,10 @@ Url: https://pypi.org/project/kafka-python/#files Source: %{short}-python-%{version}.tar.gz -Requires: python +Requires: %{_pscheduler_python} -BuildRequires: python -BuildRequires: python-setuptools +BuildRequires: %{_pscheduler_python} +BuildRequires: %{_pscheduler_python}-setuptools %description This module implements Apache Kafka producers and consumers in pure python, which can be used to interact with a pre existing Apache Kafka message bus. diff --git a/python-nmap3/unibuild-packaging/rpm/python-nmap3.spec b/python-nmap3/unibuild-packaging/rpm/python-nmap3.spec index f32f273abc..bb8b060395 100644 --- a/python-nmap3/unibuild-packaging/rpm/python-nmap3.spec +++ b/python-nmap3/unibuild-packaging/rpm/python-nmap3.spec @@ -4,7 +4,7 @@ %define short nmap3 %define actual python3-nmap -Name: python-%{short} +Name: %{_pscheduler_python}-%{short} Version: 1.5.0 Release: %{?dist} Summary: python3 library for nmap port scanner @@ -20,13 +20,13 @@ Url: https://www.nmmapper.com/ Source: %{actual}-%{version}.tar.gz -Requires: python -Requires: python-wheel +Requires: %{_pscheduler_python} +Requires: %{_pscheduler_python}-wheel Requires: nmap -BuildRequires: python -BuildRequires: python-setuptools -BuildRequires: python-wheel +BuildRequires: %{_pscheduler_python} +BuildRequires: %{_pscheduler_python}-setuptools +BuildRequires: %{_pscheduler_python}-wheel %description A python 3 library which helps in using nmap port scanner. The way this tools works is by defining each nmap command into a python function making it very easy to use sophisticated nmap commands in other python scripts. Nmap is a complicated piece of software used for reconnaissance on target networks, over the years new features have been added making it more sophisticated. diff --git a/python-nose/unibuild-packaging/rpm/python-nose.spec b/python-nose/unibuild-packaging/rpm/python-nose.spec index a916d12ae2..8379798872 100644 --- a/python-nose/unibuild-packaging/rpm/python-nose.spec +++ b/python-nose/unibuild-packaging/rpm/python-nose.spec @@ -19,7 +19,7 @@ coverage and profiling, flexible attribute-based test selection,\ output capture and more.\ -Name: python-%{modname} +Name: %{_pscheduler_python}-%{modname} Version: 1.3.7 Release: 23%{?dist} BuildArch: noarch @@ -60,10 +60,10 @@ Documentation for Nose. %package -n python3-%{modname} Summary: %{summary} -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-coverage >= 3.4-1 -Requires: python3-setuptools +BuildRequires: %{_pscheduler_python}3-devel +BuildRequires: %{_pscheduler_python}3-setuptools +BuildRequires: %{_pscheduler_python}3-coverage >= 3.4-1 +Requires: %{_pscheduler_python}3-setuptools %{?python_provide:%python_provide python3-%{modname}} Obsoletes: platform-python-%{modname} < %{version}-%{release} diff --git a/python-ntplib/unibuild-packaging/rpm/python-ntplib.spec b/python-ntplib/unibuild-packaging/rpm/python-ntplib.spec index 33929d9d51..d9539f5217 100644 --- a/python-ntplib/unibuild-packaging/rpm/python-ntplib.spec +++ b/python-ntplib/unibuild-packaging/rpm/python-ntplib.spec @@ -3,7 +3,7 @@ # %define short ntplib -Name: python-%{short} +Name: %{_pscheduler_python}-%{short} Version: 0.3.3 Release: 1%{?dist} Summary: Python library for querying NTP @@ -19,10 +19,10 @@ Url: https://pypi.python.org/pypi/ntplib Source: %{short}-%{version}.tar.gz -Requires: python +Requires: %{_pscheduler_python} -BuildRequires: python -BuildRequires: python-setuptools +BuildRequires: %{_pscheduler_python} +BuildRequires: %{_pscheduler_python}-setuptools diff --git a/python-parse-crontab/unibuild-packaging/rpm/python-parse-crontab.spec b/python-parse-crontab/unibuild-packaging/rpm/python-parse-crontab.spec index e409e65c9c..8e7a0852ea 100644 --- a/python-parse-crontab/unibuild-packaging/rpm/python-parse-crontab.spec +++ b/python-parse-crontab/unibuild-packaging/rpm/python-parse-crontab.spec @@ -3,7 +3,7 @@ # %define short parse-crontab -Name: python-%{short} +Name: %{_pscheduler_python}-%{short} Version: 0.22.6 Release: 1%{?dist} Summary: Python library for parsing crontab entries @@ -19,10 +19,10 @@ Url: https://github.com/josiahcarlson/parse-crontab Source: %{short}-%{version}.tar.gz -Requires: python +Requires: %{_pscheduler_python} -BuildRequires: python -BuildRequires: python-setuptools +BuildRequires: %{_pscheduler_python} +BuildRequires: %{_pscheduler_python}-setuptools diff --git a/python-pscheduler/pscheduler/unibuild-packaging/rpm/python-pscheduler.spec b/python-pscheduler/pscheduler/unibuild-packaging/rpm/python-pscheduler.spec index 4f1d6568d9..0efbb67ccb 100644 --- a/python-pscheduler/pscheduler/unibuild-packaging/rpm/python-pscheduler.spec +++ b/python-pscheduler/pscheduler/unibuild-packaging/rpm/python-pscheduler.spec @@ -6,7 +6,7 @@ %define perfsonar_auto_relnum 0.a1.0 %define short pscheduler -Name: python-%{short} +Name: %{_pscheduler_python}-%{short} Version: %{perfsonar_auto_version} Release: %{perfsonar_auto_relnum}%{?dist} Summary: Utility functions for pScheduler @@ -27,52 +27,52 @@ Source0: %{short}-%{version}.tar.gz Requires: iputils -Requires: python-attrs -Requires: python-dateutil -Requires: python-dns -Requires: python-isodate -Requires: python-jinja2 -Requires: python-jsonschema >= 3.0 -Requires: python-netaddr -Requires: python-netifaces -Requires: python-ntplib -Requires: python-psutil -Requires: python-psycopg2 >= 2.6.1 -Requires: python-py-radix +Requires: %{_pscheduler_python}-attrs +Requires: %{_pscheduler_python}-dateutil +Requires: %{_pscheduler_python}-dns +Requires: %{_pscheduler_python}-isodate +Requires: %{_pscheduler_python}-jinja2 +Requires: %{_pscheduler_python}-jsonschema >= 3.0 +Requires: %{_pscheduler_python}-netaddr +Requires: %{_pscheduler_python}-netifaces +Requires: %{_pscheduler_python}-ntplib +Requires: %{_pscheduler_python}-psutil +Requires: %{_pscheduler_python}-psycopg2 >= 2.6.1 +Requires: %{_pscheduler_python}-py-radix # The limit system uses this. Requires: pscheduler-jq-library -Requires: python-pycurl -Requires: python-pyjq >= 2.2.0 -Requires: python-tzlocal -Requires: python-pytz +Requires: %{_pscheduler_python}-pycurl +Requires: %{_pscheduler_python}-pyjq >= 2.2.0 +Requires: %{_pscheduler_python}-tzlocal +Requires: %{_pscheduler_python}-pytz Requires: rsyslog Requires: logrotate Requires: numactl BuildRequires: pscheduler-rpm -BuildRequires: python -BuildRequires: python-coverage -BuildRequires: python-nose -BuildRequires: python-setuptools +BuildRequires: %{_pscheduler_python} +BuildRequires: %{_pscheduler_python}-coverage +BuildRequires: %{_pscheduler_python}-nose +BuildRequires: %{_pscheduler_python}-setuptools # NOTE: Cloned from above. BuildRequires: iputils -BuildRequires: python-attrs -BuildRequires: python-dateutil -BuildRequires: python-dns -BuildRequires: python-isodate -BuildRequires: python-jsonschema -BuildRequires: python-netaddr -BuildRequires: python-netifaces -BuildRequires: python-ntplib -BuildRequires: python-psutil -BuildRequires: python-psycopg2 >= 2.2.0 -BuildRequires: python-py-radix +BuildRequires: %{_pscheduler_python}-attrs +BuildRequires: %{_pscheduler_python}-dateutil +BuildRequires: %{_pscheduler_python}-dns +BuildRequires: %{_pscheduler_python}-isodate +BuildRequires: %{_pscheduler_python}-jsonschema +BuildRequires: %{_pscheduler_python}-netaddr +BuildRequires: %{_pscheduler_python}-netifaces +BuildRequires: %{_pscheduler_python}-ntplib +BuildRequires: %{_pscheduler_python}-psutil +BuildRequires: %{_pscheduler_python}-psycopg2 >= 2.2.0 +BuildRequires: %{_pscheduler_python}-py-radix # The limit system uses this. BuildRequires: pscheduler-jq-library -BuildRequires: python-pycurl -BuildRequires: python-pyjq >= 2.2.0 -BuildRequires: python-tzlocal -BuildRequires: python-pytz +BuildRequires: %{_pscheduler_python}-pycurl +BuildRequires: %{_pscheduler_python}-pyjq >= 2.2.0 +BuildRequires: %{_pscheduler_python}-tzlocal +BuildRequires: %{_pscheduler_python}-pytz BuildRequires: numactl %define limit_config %{_pscheduler_sysconfdir}/limits.conf diff --git a/python-py-amqp/unibuild-packaging/rpm/python-py-amqp.spec b/python-py-amqp/unibuild-packaging/rpm/python-py-amqp.spec index a276c7ea47..4089c24dde 100644 --- a/python-py-amqp/unibuild-packaging/rpm/python-py-amqp.spec +++ b/python-py-amqp/unibuild-packaging/rpm/python-py-amqp.spec @@ -3,7 +3,7 @@ # %define short py-amqp -Name: python-%{short} +Name: %{_pscheduler_python}-%{short} Version: 5.0.6 Release: 1%{?dist} Summary: A pure Python library for AMQP @@ -19,11 +19,11 @@ Url: https://docs.celeryproject.org/projects/amqp/en/latest/ Source: %{short}-%{version}.tar.gz -Requires: python +Requires: %{_pscheduler_python} -BuildRequires: python -BuildRequires: python-setuptools -BuildRequires: python-vine +BuildRequires: %{_pscheduler_python} +BuildRequires: %{_pscheduler_python}-setuptools +BuildRequires: %{_pscheduler_python}-vine %description diff --git a/python-py-radix/unibuild-packaging/rpm/python-py-radix.spec b/python-py-radix/unibuild-packaging/rpm/python-py-radix.spec index 9f3bf99ae3..dfe58380ac 100644 --- a/python-py-radix/unibuild-packaging/rpm/python-py-radix.spec +++ b/python-py-radix/unibuild-packaging/rpm/python-py-radix.spec @@ -3,7 +3,7 @@ # %define short py-radix -Name: python-%{short} +Name: %{_pscheduler_python}-%{short} Version: 0.9.6 Release: 1%{?dist} Summary: Radix tree for Python @@ -19,12 +19,12 @@ URL: https://github.com/mjschultz/py-radix Source: %{short}-%{version}.tar.gz -Requires: python +Requires: %{_pscheduler_python} BuildRequires: gcc -BuildRequires: python -BuildRequires: python-setuptools -BuildRequires: python-devel +BuildRequires: %{_pscheduler_python} +BuildRequires: %{_pscheduler_python}-setuptools +BuildRequires: %{_pscheduler_python}-devel %description A network address manipulation library for Python diff --git a/python-pyasn1-modules/unibuild-packaging/rpm/python-pyasn1-modules.spec b/python-pyasn1-modules/unibuild-packaging/rpm/python-pyasn1-modules.spec index 2d9f6c4834..d1629b06c9 100644 --- a/python-pyasn1-modules/unibuild-packaging/rpm/python-pyasn1-modules.spec +++ b/python-pyasn1-modules/unibuild-packaging/rpm/python-pyasn1-modules.spec @@ -3,7 +3,7 @@ # %define short pyasn1-modules -Name: python-%{short} +Name: %{_pscheduler_python}-%{short} Version: 0.2.4 Release: 1%{?dist} Summary: ASN1 modules for Python @@ -20,11 +20,11 @@ URL: https://github.com/etingof/pyasn1 Source: %{short}-%{version}.tar.gz -Requires: python -Requires: python-pyasn1 >= 0.4.5 +Requires: %{_pscheduler_python} +Requires: %{_pscheduler_python}-pyasn1 >= 0.4.5 -BuildRequires: python -BuildRequires: python-setuptools +BuildRequires: %{_pscheduler_python} +BuildRequires: %{_pscheduler_python}-setuptools %description ASN1 modules for Python diff --git a/python-pyasn1/unibuild-packaging/rpm/python-pyasn1.spec b/python-pyasn1/unibuild-packaging/rpm/python-pyasn1.spec index c3214aee20..f2b213cc0c 100644 --- a/python-pyasn1/unibuild-packaging/rpm/python-pyasn1.spec +++ b/python-pyasn1/unibuild-packaging/rpm/python-pyasn1.spec @@ -3,7 +3,7 @@ # %define short pyasn1 -Name: python-%{short} +Name: %{_pscheduler_python}-%{short} Version: 0.4.5 Release: 1%{?dist} Summary: ASN1 for Python @@ -20,10 +20,10 @@ URL: https://github.com/etingof/pyasn1 Source: %{short}-%{version}.tar.gz -Requires: python +Requires: %{_pscheduler_python} -BuildRequires: python -BuildRequires: python-setuptools +BuildRequires: %{_pscheduler_python} +BuildRequires: %{_pscheduler_python}-setuptools %description ASN1 for Python diff --git a/python-pyjq/unibuild-packaging/rpm/python-pyjq.spec b/python-pyjq/unibuild-packaging/rpm/python-pyjq.spec index 7c38d40f9e..2e16bd28d5 100644 --- a/python-pyjq/unibuild-packaging/rpm/python-pyjq.spec +++ b/python-pyjq/unibuild-packaging/rpm/python-pyjq.spec @@ -3,7 +3,7 @@ # %define short pyjq -Name: python-%{short} +Name: %{_pscheduler_python}-%{short} Version: 2.4.0 Release: 2%{?dist} Summary: Python bindings to JQ @@ -21,14 +21,14 @@ Source: %{short}-%{version}.tar.gz Patch0: python-%{short}-%{version}-00-nodownloads.patch Patch1: python-%{short}-%{version}-01-integer.patch -Requires: python +Requires: %{_pscheduler_python} # Note that 1.6.10 is a pScheduler-specific version that includes a # bug fix required for this module. See #717. Requires: jq >= 1.6.10 Requires: oniguruma >= 5.9 -BuildRequires: python -BuildRequires: python-setuptools +BuildRequires: %{_pscheduler_python} +BuildRequires: %{_pscheduler_python}-setuptools BuildRequires: Cython >= 0.19 BuildRequires: jq-devel >= 1.5 BuildRequires: oniguruma-devel >= 5.9 diff --git a/python-pyrsistent/unibuild-packaging/rpm/python-pyrsistent.spec b/python-pyrsistent/unibuild-packaging/rpm/python-pyrsistent.spec index 973f9f2e62..495f90eb8e 100644 --- a/python-pyrsistent/unibuild-packaging/rpm/python-pyrsistent.spec +++ b/python-pyrsistent/unibuild-packaging/rpm/python-pyrsistent.spec @@ -3,7 +3,7 @@ # %define short pyrsistent -Name: python-%{short} +Name: %{_pscheduler_python}-%{short} Version: 0.14.11 Release: 1%{?dist} Summary: Persistent/Immutable/Functional data structures for Python @@ -21,13 +21,13 @@ URL: https://github.com/tobgu/pyrsistent Source: %{short}-%{version}.tar.gz -Requires: python -Requires: python-six +Requires: %{_pscheduler_python} +Requires: %{_pscheduler_python}-six -BuildRequires: python-six -BuildRequires: python -BuildRequires: python-devel -BuildRequires: python-setuptools +BuildRequires: %{_pscheduler_python}-six +BuildRequires: %{_pscheduler_python} +BuildRequires: %{_pscheduler_python}-devel +BuildRequires: %{_pscheduler_python}-setuptools %description Pyrsistent is a number of persistent collections (by some referred to diff --git a/python-pysnmp/unibuild-packaging/rpm/pysnmp.spec b/python-pysnmp/unibuild-packaging/rpm/pysnmp.spec index 6e6cea9121..d405dc5e80 100644 --- a/python-pysnmp/unibuild-packaging/rpm/pysnmp.spec +++ b/python-pysnmp/unibuild-packaging/rpm/pysnmp.spec @@ -3,7 +3,7 @@ # %define short pysnmp -Name: python-%{short} +Name: %{_pscheduler_python}-%{short} Version: 4.4.12 Release: 1%{?dist} Summary: Python library for SNMP @@ -19,11 +19,11 @@ Prefix: %{_prefix} Source: %{short}-%{version}.tar.gz -Requires: python -Requires: python-pyasn1 >= 0.3.7 +Requires: %{_pscheduler_python} +Requires: %{_pscheduler_python}-pyasn1 >= 0.3.7 -BuildRequires: python -BuildRequires: python-setuptools +BuildRequires: %{_pscheduler_python} +BuildRequires: %{_pscheduler_python}-setuptools %description diff --git a/python-tzlocal/unibuild-packaging/rpm/python-tzlocal.spec b/python-tzlocal/unibuild-packaging/rpm/python-tzlocal.spec index 77c8a25477..5034fc8a71 100644 --- a/python-tzlocal/unibuild-packaging/rpm/python-tzlocal.spec +++ b/python-tzlocal/unibuild-packaging/rpm/python-tzlocal.spec @@ -3,7 +3,7 @@ # %define short tzlocal -Name: python-%{short} +Name: %{_pscheduler_python}-%{short} Version: 1.2.2 Release: 1%{?dist} Summary: Local timezone information for Python @@ -19,10 +19,10 @@ Url: https://github.com/regebro/tzlocal Source: %{short}-%{version}.tar.gz -BuildRequires: python -BuildRequires: python-setuptools +BuildRequires: %{_pscheduler_python} +BuildRequires: %{_pscheduler_python}-setuptools -Requires: python +Requires: %{_pscheduler_python} %description diff --git a/python-vcversioner/unibuild-packaging/rpm/python-vcversioner.spec b/python-vcversioner/unibuild-packaging/rpm/python-vcversioner.spec index 5e0a037268..f8d4cb8900 100644 --- a/python-vcversioner/unibuild-packaging/rpm/python-vcversioner.spec +++ b/python-vcversioner/unibuild-packaging/rpm/python-vcversioner.spec @@ -3,7 +3,7 @@ # %define short vcversioner -Name: python-%{short} +Name: %{_pscheduler_python}-%{short} Version: 2.16.0.0 Release: 1%{?dist} Summary: Python version extractor @@ -19,10 +19,10 @@ URL: https://github.com/habnabit/vcversioner Source: %{short}-%{version}.tar.gz -Requires: python +Requires: %{_pscheduler_python} -BuildRequires: python -BuildRequires: python-setuptools +BuildRequires: %{_pscheduler_python} +BuildRequires: %{_pscheduler_python}-setuptools %description diff --git a/python-vine/unibuild-packaging/rpm/python-vine.spec b/python-vine/unibuild-packaging/rpm/python-vine.spec index b1b03d70cf..a16a2be7c3 100644 --- a/python-vine/unibuild-packaging/rpm/python-vine.spec +++ b/python-vine/unibuild-packaging/rpm/python-vine.spec @@ -3,7 +3,7 @@ # %define short vine -Name: python-%{short} +Name: %{_pscheduler_python}-%{short} Version: 5.0.0 Release: 1%{?dist} Summary: A pure Python library implementing promises @@ -19,10 +19,10 @@ Url: https://docs.celeryproject.org/projects/amqp/en/latest/ Source: %{short}-%{version}.tar.gz -Requires: python +Requires: %{_pscheduler_python} -BuildRequires: python -BuildRequires: python-setuptools +BuildRequires: %{_pscheduler_python} +BuildRequires: %{_pscheduler_python}-setuptools %description A pure Python library implementing promises diff --git a/python-werkzeug/unibuild-packaging/rpm/python-werkzeug.spec b/python-werkzeug/unibuild-packaging/rpm/python-werkzeug.spec index 57ef80f34d..0b546da1a5 100644 --- a/python-werkzeug/unibuild-packaging/rpm/python-werkzeug.spec +++ b/python-werkzeug/unibuild-packaging/rpm/python-werkzeug.spec @@ -3,7 +3,7 @@ # %define short werkzeug -Name: python-%{short} +Name: %{_pscheduler_python}-%{short} Version: 0.15.5 Release: 1%{?dist} BuildArch: noarch @@ -19,17 +19,17 @@ Prefix: %{_prefix} Source: %{short}-%{version}.tar.gz -Requires: python -BuildRequires: python-devel -BuildRequires: python-setuptools +Requires: %{_pscheduler_python} +BuildRequires: %{_pscheduler_python}-devel +BuildRequires: %{_pscheduler_python}-setuptools %if %{?ol8:0}%{!?ol8:1} # OL8 doesn't have this, but the build succeeds without it. # TODO: See of we can live without this on CentOS -BuildRequires: python-sphinx +BuildRequires: %{_pscheduler_python}-sphinx %endif -BuildRequires: python-setuptools +BuildRequires: %{_pscheduler_python}-setuptools %description Werkzeug diff --git a/scripts/PDK/templates/test/__PLUGIN_NAME__/unibuild-packaging/rpm/pscheduler-test-__PLUGIN_NAME__.spec b/scripts/PDK/templates/test/__PLUGIN_NAME__/unibuild-packaging/rpm/pscheduler-test-__PLUGIN_NAME__.spec index e0c1c1734d..5d4c6c1753 100644 --- a/scripts/PDK/templates/test/__PLUGIN_NAME__/unibuild-packaging/rpm/pscheduler-test-__PLUGIN_NAME__.spec +++ b/scripts/PDK/templates/test/__PLUGIN_NAME__/unibuild-packaging/rpm/pscheduler-test-__PLUGIN_NAME__.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 @@ __PLUGIN_NAME__ test class for pScheduler %build make \ - PYTHON=python \ + PYTHON=%{_pscheduler_python} \ DESTDIR=$RPM_BUILD_ROOT/%{dest} \ install diff --git a/scripts/PDK/templates/tool/__PLUGIN_NAME__/unibuild-packaging/rpm/pscheduler-tool-__PLUGIN_NAME__.spec b/scripts/PDK/templates/tool/__PLUGIN_NAME__/unibuild-packaging/rpm/pscheduler-tool-__PLUGIN_NAME__.spec index 6c8ee7212c..da3f540584 100644 --- a/scripts/PDK/templates/tool/__PLUGIN_NAME__/unibuild-packaging/rpm/pscheduler-tool-__PLUGIN_NAME__.spec +++ b/scripts/PDK/templates/tool/__PLUGIN_NAME__/unibuild-packaging/rpm/pscheduler-tool-__PLUGIN_NAME__.spec @@ -27,7 +27,7 @@ Provides: %{name} = %{version}-%{release} # Include all required libraries here Requires: pscheduler-server -Requires: python-pscheduler +Requires: %{_pscheduler_python}-pscheduler BuildRequires: pscheduler-rpm