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 607261b52e..db4dc6b3c5 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: %{_pscheduler_python}-pscheduler +Requires: 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 8cf08c14b5..8163c4085f 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: %{_pscheduler_python}-pscheduler >= 1.3.7.1 -Requires: %{_pscheduler_python}-memcached +Requires: python-pscheduler >= 1.3.7.1 +Requires: python-memcached Requires: memcached Requires(post): memcached Requires: chkconfig BuildRequires: pscheduler-rpm -BuildRequires: %{_pscheduler_python}-pscheduler -BuildRequires: %{_pscheduler_python_epel}-nose +BuildRequires: python-pscheduler +BuildRequires: python-nose %define directory %{_includedir}/make @@ -45,7 +45,7 @@ This archiver sends JSON test results to Esmond Measurement Archive %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 d0e1b2b38f..4b42cf9931 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: %{_pscheduler_python}-pscheduler +Requires: 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 bfa3532a41..661a12ebcc 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: %{_pscheduler_python}-pscheduler >= 1.3.7.1 +Requires: 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 78807c0061..f50dffac73 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: %{_pscheduler_python}-kafka -Requires: %{_pscheduler_python}-pscheduler +Requires: python-kafka +Requires: 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 fa68154950..772b077f69 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: %{_pscheduler_python_epel}-psycopg2 >= 2.6.1 +Requires: 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 10f7ee1370..eba897bb63 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: %{_pscheduler_python}-pscheduler >= 1.3.7.3 -Requires: %{_pscheduler_python}-py-amqp >= 5.0.6 -Requires: %{_pscheduler_python}-vine >= 5.0.0 +Requires: python-pscheduler >= 1.3.7.3 +Requires: python-py-amqp >= 5.0.6 +Requires: 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 49181988c0..18aa1f5487 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: %{_pscheduler_python}-pscheduler -Requires: %{_pscheduler_python}-pysnmp +Requires: python-pscheduler +Requires: 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 ddb8a805f6..6a3d6a2e4b 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: %{_pscheduler_python}-pscheduler >= 4.4.0 +Requires: python-pscheduler >= 4.4.0 BuildRequires: pscheduler-rpm -BuildRequires: %{_pscheduler_python} -BuildRequires: %{_pscheduler_python_epel}-nose +BuildRequires: python +BuildRequires: 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 bfbfa09e39..c657251d92 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: %{_pscheduler_python}-pscheduler >= 5.0.0 +Requires: python-pscheduler >= 5.0.0 BuildRequires: pscheduler-rpm -BuildRequires: %{_pscheduler_python} -BuildRequires: %{_pscheduler_python_epel}-nose +BuildRequires: python +BuildRequires: 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 f1d8f3ad64..34f2c74c46 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: %{_pscheduler_python}-pscheduler +Requires: 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 335fd367be..4971d8d504 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: %{_pscheduler_python}-pscheduler +Requires: 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 4f971bfef7..38bff4f2fe 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: %{_pscheduler_python}-pscheduler +Requires: 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 f46465d161..323839962a 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: %{_pscheduler_python}-pscheduler +Requires: 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 85de814cc3..e1400f7753 100644 --- a/pscheduler-core/pscheduler-core/unibuild-packaging/rpm/pscheduler-core.spec +++ b/pscheduler-core/pscheduler-core/unibuild-packaging/rpm/pscheduler-core.spec @@ -26,7 +26,7 @@ Requires: gnuplot >= 4.6.2 # This is for netstat. Requires: net-tools -Requires: %{_pscheduler_python}-pscheduler >= 4.4.0 +Requires: python-pscheduler >= 4.4.0 Requires: curl Requires: dmidecode diff --git a/pscheduler-rpm/unibuild-packaging/rpm/pscheduler-rpm.spec b/pscheduler-rpm/unibuild-packaging/rpm/pscheduler-rpm.spec index 6136cdfc65..7320f5765b 100644 --- a/pscheduler-rpm/unibuild-packaging/rpm/pscheduler-rpm.spec +++ b/pscheduler-rpm/unibuild-packaging/rpm/pscheduler-rpm.spec @@ -35,24 +35,6 @@ cat > $RPM_BUILD_ROOT/%{macro_prefix}%{name} < $RPM_BUILD_ROOT/%{macro_prefix}%{name} <= 5.1.0 +BuildRequires: python-parse-crontab +BuildRequires: python-pscheduler >= 5.1.0 BuildRequires: m4 Requires: httpd-wsgi-socket # Note that the actual definition of what protocol is used is part of @@ -71,13 +71,13 @@ Requires: httpd-wsgi-socket # mod_ssl is required here. Requires: mod_ssl Requires: mod_wsgi > 4.0 -Requires: %{_pscheduler_python}-parse-crontab -Requires: %{_pscheduler_python}-pscheduler >= 5.1.0 -Requires: %{_pscheduler_python}-pytz +Requires: python-parse-crontab +Requires: python-pscheduler >= 5.1.0 +Requires: python-pytz # General BuildRequires: pscheduler-rpm -BuildRequires: %{_pscheduler_python} +BuildRequires: python BuildRequires: systemd %{?systemd_requires: %systemd_requires} @@ -254,7 +254,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_pscheduler_log_dir} # # API Server # -API_ROOT="$(%{_pscheduler_python} -c 'import pscheduler ; print(pscheduler.api_root())')" +API_ROOT="$(python -c 'import pscheduler ; print(pscheduler.api_root())')" make -C api-server \ 'USER_NAME=%{_pscheduler_user}' \ @@ -265,7 +265,7 @@ make -C api-server \ "PREFIX=${RPM_BUILD_ROOT}" \ "DSN_FILE=%{dsn_file}" \ "LIMITS_FILE=%{_pscheduler_limit_config}" \ - "PYTHON=%(command -v %{_pscheduler_python})" \ + "PYTHON=%(command -v python)" \ "RUN_DIR=%{run_dir}" \ install @@ -583,7 +583,7 @@ fi # Any upgrade of python-pscheduler needs to force a database restart # because Pg doesn't see module upgrades. -%triggerin -- %{_pscheduler_python}-pscheduler +%triggerin -- python-pscheduler systemctl reload-or-try-restart "%{_pscheduler_postgresql_service}" # ------------------------------------------------------------------------------ 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 b909974651..3a5ee7a10d 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,8 +21,8 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server >= 1.1.6 -Requires: %{_pscheduler_python}-pscheduler >= 1.3 -Requires: %{_pscheduler_python}-jsontemplate +Requires: python-pscheduler >= 1.3 +Requires: python-jsontemplate BuildRequires: pscheduler-rpm @@ -39,7 +39,7 @@ Clock test class for pScheduler %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 a07f263f45..e56416284d 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,8 +29,8 @@ Provides: %{name} = %{version}-%{release} # Include all required libraries here Requires: pscheduler-server -Requires: %{_pscheduler_python}-pscheduler >= 1.3 -Requires: %{_pscheduler_python}-jsontemplate +Requires: python-pscheduler >= 1.3 +Requires: python-jsontemplate BuildRequires: pscheduler-rpm @@ -47,7 +47,7 @@ dhcp test class for pScheduler %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 2b052d4d12..4dad11f80c 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,8 +29,8 @@ Provides: %{name} = %{version}-%{release} # Include all required libraries here Requires: pscheduler-server -Requires: %{_pscheduler_python}-pscheduler >= 1.3 -Requires: %{_pscheduler_python}-jsontemplate +Requires: python-pscheduler >= 1.3 +Requires: python-jsontemplate BuildRequires: pscheduler-rpm @@ -47,7 +47,7 @@ disk-to-disk test class for pScheduler %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 59b60b7fc0..edfcfff7f8 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,8 +21,8 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server -Requires: %{_pscheduler_python}-pscheduler >= 1.3 -Requires: %{_pscheduler_python}-jsontemplate +Requires: python-pscheduler >= 1.3 +Requires: python-jsontemplate BuildRequires: pscheduler-rpm @@ -39,7 +39,7 @@ DNS test class for pScheduler %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 064a88e803..3f3914db6b 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,8 +29,8 @@ Provides: %{name} = %{version}-%{release} # Include all required libraries here Requires: pscheduler-server -Requires: %{_pscheduler_python}-pscheduler >= 1.3 -Requires: %{_pscheduler_python}-jsontemplate +Requires: python-pscheduler >= 1.3 +Requires: python-jsontemplate BuildRequires: pscheduler-rpm @@ -47,7 +47,7 @@ dot1x test class for pScheduler %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 574c4f6676..88a7010a63 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,8 +21,8 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server -Requires: %{_pscheduler_python}-pscheduler >= 1.3 -Requires: %{_pscheduler_python}-jsontemplate +Requires: python-pscheduler >= 1.3 +Requires: python-jsontemplate BuildRequires: pscheduler-rpm @@ -39,7 +39,7 @@ HTTP test class for pScheduler %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 5d8d985600..9615f84f37 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: %{_pscheduler_python}-pscheduler +Requires: python-pscheduler BuildRequires: pscheduler-rpm @@ -38,7 +38,7 @@ Idle test class for pScheduler %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 67bb04f906..1435e423e5 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,8 +21,8 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server >= 1.1.6 -Requires: %{_pscheduler_python}-pscheduler -Requires: %{_pscheduler_python}-jsontemplate +Requires: python-pscheduler +Requires: python-jsontemplate BuildRequires: pscheduler-rpm @@ -40,7 +40,7 @@ produces multiple results. %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 d6a796c3d7..9acf0b1088 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,8 +21,8 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server -Requires: %{_pscheduler_python}-pscheduler -Requires: %{_pscheduler_python}-jsontemplate +Requires: python-pscheduler +Requires: python-jsontemplate BuildRequires: pscheduler-rpm @@ -39,7 +39,7 @@ Idle test class for pScheduler that runs exclusively. %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 d2f69e5366..9f67e67613 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,12 +21,12 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server >= 1.1.6 -Requires: %{_pscheduler_python}-pscheduler -Requires: %{_pscheduler_python}-jsontemplate +Requires: python-pscheduler +Requires: python-jsontemplate BuildRequires: pscheduler-rpm -BuildRequires: %{_pscheduler_python}-pscheduler -BuildRequires: %{_pscheduler_python_epel}-nose +BuildRequires: python-pscheduler +BuildRequires: python-nose %description Latency test class for pScheduler @@ -40,7 +40,7 @@ Latency test class for pScheduler %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 820c50857d..848e262094 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: %{_pscheduler_python}-pscheduler +Requires: python-pscheduler BuildRequires: pscheduler-rpm -BuildRequires: %{_pscheduler_python}-pscheduler -BuildRequires: %{_pscheduler_python_epel}-nose +BuildRequires: python-pscheduler +BuildRequires: 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=%{_pscheduler_python} \ + PYTHON=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 f09c3b0ad2..b266029538 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,8 +29,8 @@ Provides: %{name} = %{version}-%{release} # Include all required libraries here Requires: pscheduler-server -Requires: %{_pscheduler_python}-pscheduler >= 1.3 -Requires: %{_pscheduler_python}-jsontemplate +Requires: python-pscheduler >= 1.3 +Requires: python-jsontemplate BuildRequires: pscheduler-rpm @@ -47,7 +47,7 @@ MTU test class for pScheduler %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 f465444017..dc80f2d373 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,8 +21,8 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server -Requires: %{_pscheduler_python}-pscheduler >= 1.3 -Requires: %{_pscheduler_python}-jsontemplate +Requires: python-pscheduler >= 1.3 +Requires: python-jsontemplate BuildRequires: pscheduler-rpm @@ -39,7 +39,7 @@ Network reachability test for pScheduler %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 2af922b714..5d95b54dc5 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: %{_pscheduler_python}-pscheduler +Requires: python-pscheduler BuildRequires: pscheduler-rpm @@ -38,7 +38,7 @@ No-op test class for pScheduler %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 ba6bae1ce9..649bebd345 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,8 +29,8 @@ Provides: %{name} = %{version}-%{release} # Include all required libraries here Requires: pscheduler-server -Requires: %{_pscheduler_python}-pscheduler >= 1.3 -Requires: %{_pscheduler_python}-jsontemplate +Requires: python-pscheduler >= 1.3 +Requires: python-jsontemplate BuildRequires: pscheduler-rpm @@ -47,7 +47,7 @@ openports test class for pScheduler %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 c85f67dfa2..b11d202949 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,8 +21,8 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server -Requires: %{_pscheduler_python}-pscheduler >= 1.3 -Requires: %{_pscheduler_python}-jsontemplate +Requires: python-pscheduler >= 1.3 +Requires: python-jsontemplate BuildRequires: pscheduler-rpm @@ -39,7 +39,7 @@ Response test class for pScheduler %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 a863e56e7e..c664269d85 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,12 +21,12 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server -Requires: %{_pscheduler_python}-pscheduler >= 1.3 -Requires: %{_pscheduler_python}-jsontemplate +Requires: python-pscheduler >= 1.3 +Requires: python-jsontemplate BuildRequires: pscheduler-rpm -BuildRequires: %{_pscheduler_python}-pscheduler -BuildRequires: %{_pscheduler_python_epel}-nose +BuildRequires: python-pscheduler +BuildRequires: python-nose %description Round trip time test class for pScheduler @@ -40,7 +40,7 @@ Round trip time test class for pScheduler %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 9c64dcd136..6928975aea 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,8 +29,8 @@ Provides: %{name} = %{version}-%{release} # Include all required libraries here Requires: pscheduler-server -Requires: %{_pscheduler_python}-pscheduler >= 1.3 -Requires: %{_pscheduler_python}-jsontemplate +Requires: python-pscheduler >= 1.3 +Requires: python-jsontemplate Requires: s3-benchmark BuildRequires: pscheduler-rpm @@ -48,7 +48,7 @@ s3throughput test class for pScheduler %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 b62732b91e..592f774ee4 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,8 +21,8 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server >= 1.1.6 -Requires: %{_pscheduler_python}-pscheduler > 1.3.2.6.0 -Requires: %{_pscheduler_python}-jsontemplate +Requires: python-pscheduler > 1.3.2.6.0 +Requires: python-jsontemplate BuildRequires: pscheduler-rpm @@ -39,7 +39,7 @@ Simplestream test class for pScheduler %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 0beb6a2945..5dad5e344e 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,8 +23,8 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server -Requires: %{_pscheduler_python}-pscheduler >= 1.3 -Requires: %{_pscheduler_python}-jsontemplate +Requires: python-pscheduler >= 1.3 +Requires: python-jsontemplate BuildRequires: pscheduler-rpm @@ -41,7 +41,7 @@ SNMP test class for pScheduler %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 3ef3c57646..d2a4835614 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,8 +21,8 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server -Requires: %{_pscheduler_python}-pscheduler >= 1.3 -Requires: %{_pscheduler_python}-jsontemplate +Requires: python-pscheduler >= 1.3 +Requires: python-jsontemplate BuildRequires: pscheduler-rpm @@ -39,7 +39,7 @@ SNMP test class for pScheduler %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 2d781bcd4e..57085cbfb8 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,8 +21,8 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server -Requires: %{_pscheduler_python}-pscheduler >= 1.3 -Requires: %{_pscheduler_python}-jsontemplate +Requires: python-pscheduler >= 1.3 +Requires: python-jsontemplate BuildRequires: pscheduler-rpm @@ -39,7 +39,7 @@ SNMP Set test class for pScheduler %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 ab0176607a..4fd92bae5f 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,12 +21,12 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server -Requires: %{_pscheduler_python}-pscheduler -Requires: %{_pscheduler_python}-jsontemplate +Requires: python-pscheduler +Requires: python-jsontemplate BuildRequires: pscheduler-rpm -BuildRequires: %{_pscheduler_python}-pscheduler -BuildRequires: %{_pscheduler_python_epel}-nose +BuildRequires: python-pscheduler +BuildRequires: python-nose %description Throughput test class for pScheduler @@ -40,7 +40,7 @@ Throughput test class for pScheduler %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 8d7a20bc8a..a92a9c1ca9 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,12 +21,12 @@ Source0: %{short}-%{version}.tar.gz Provides: %{name} = %{version}-%{release} Requires: pscheduler-server >= 1.1.6 -Requires: %{_pscheduler_python}-pscheduler >= 1.3 -Requires: %{_pscheduler_python}-jsontemplate +Requires: python-pscheduler >= 1.3 +Requires: python-jsontemplate BuildRequires: pscheduler-rpm -BuildRequires: %{_pscheduler_python}-pscheduler -BuildRequires: %{_pscheduler_python_epel}-nose +BuildRequires: python-pscheduler +BuildRequires: python-nose %description Simplestream test class for pScheduler @@ -40,7 +40,7 @@ Simplestream test class for pScheduler %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 96ac52b9cd..c09df47929 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,8 +29,8 @@ Provides: %{name} = %{version}-%{release} # Include all required libraries here Requires: pscheduler-server -Requires: %{_pscheduler_python}-pscheduler >= 1.3 -Requires: %{_pscheduler_python}-jsontemplate +Requires: python-pscheduler >= 1.3 +Requires: python-jsontemplate BuildRequires: pscheduler-rpm @@ -47,7 +47,7 @@ wifibssid test class for pScheduler %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 4c7ca4daf0..b8e656781e 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: %{_pscheduler_python}-pscheduler +Requires: 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 1e27ada4d8..8b2919a695 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: %{_pscheduler_python}-pscheduler >= 4.3.0 -Requires: %{_pscheduler_python}-pycurl +Requires: python-pscheduler >= 4.3.0 +Requires: python-pycurl BuildRequires: pscheduler-rpm @@ -45,7 +45,7 @@ curl tool class for pScheduler %build make \ DESTDIR=$RPM_BUILD_ROOT/%{dest} \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 7007e2e7db..9e5bfa2ef4 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: %{_pscheduler_python}-pscheduler >= 4.3.0 -Requires: %{_pscheduler_python}-pycurl +Requires: python-pscheduler >= 4.3.0 +Requires: python-pycurl BuildRequires: pscheduler-rpm @@ -45,7 +45,7 @@ curl tool class for pScheduler %build make \ DESTDIR=$RPM_BUILD_ROOT/%{dest} \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 9e91de86f2..62b7b6df29 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: %{_pscheduler_python}-pscheduler +Requires: 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=%{_pscheduler_python} \ + PYTHON=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 0193e10601..c69e1de9ff 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: %{_pscheduler_python_epel}-dns -Requires: %{_pscheduler_python}-pscheduler +Requires: python-dns +Requires: python-pscheduler Requires: pscheduler-test-dns BuildRequires: pscheduler-rpm @@ -40,7 +40,7 @@ DNS tool class for pScheduler %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 c0bd1b2b3d..8611c22dc0 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: %{_pscheduler_python}-pscheduler >= 4.3.0 +Requires: python-pscheduler >= 4.3.0 Requires: pscheduler-test-trace Requires: dublin-traceroute >= 0.4.2 -Requires: %{_pscheduler_python}-icmperror +Requires: 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 75770f2b60..940ce596fa 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: %{_pscheduler_python}-pscheduler +Requires: 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 38f01473da..e8b2ce93dd 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: %{_pscheduler_python}-pscheduler >= 4.3.0 +Requires: 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 d82ca08769..8b558ff709 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: %{_pscheduler_python}-pscheduler +Requires: 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 8cb05ca8b3..b39e3c1aeb 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: %{_pscheduler_python}-pscheduler >= 4.3.0 +Requires: 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 304d5eb7cf..026576fc7d 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: %{_pscheduler_python}-pscheduler >= 5.0.0 +Requires: 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 5b160ee295..423428e929 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: %{_pscheduler_python}-pscheduler >= 4.3.0 +Requires: python-pscheduler >= 4.3.0 Requires: pscheduler-test-throughput requires: iperf @@ -40,7 +40,7 @@ iperf2 tool class for pScheduler %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 a1f20a916c..9b00579995 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: %{_pscheduler_python}-pscheduler >= 4.4.1 -Requires: %{_pscheduler_python_epel}-cryptography +Requires: python-pscheduler >= 4.4.1 +Requires: python-cryptography Requires: pscheduler-test-throughput requires: iperf3 >= 3.11 Requires: numactl @@ -42,7 +42,7 @@ iperf3 tool class for pScheduler %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 072b72cb43..4b04a5a0bc 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: %{_pscheduler_python}-pscheduler >= 4.3.0 +Requires: 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 6ee0d993fd..2ea39835e0 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: %{_pscheduler_python}-pscheduler >= 4.3.0 +Requires: 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 6d7d126a32..b8b31187fb 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: %{_pscheduler_python}-pscheduler -Requires: %{_pscheduler_python}-nmap3 +Requires: python-pscheduler +Requires: 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 c627e1dd1f..0dcaefcfa6 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: %{_pscheduler_python}-pscheduler >= 4.4.0 +Requires: 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=%{_pscheduler_python} \ + PYTHON=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 93a37aa239..85114b2462 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: %{_pscheduler_python}-pscheduler >= 4.3.0 +Requires: python-pscheduler >= 4.3.0 Requires: pscheduler-test-latency Requires: owamp-client Requires: owamp-server BuildRequires: pscheduler-rpm -BuildRequires: %{_pscheduler_python}-pscheduler -BuildRequires: %{_pscheduler_python_epel}-nose +BuildRequires: python-pscheduler +BuildRequires: python-nose %description owping tool class for pScheduler @@ -42,7 +42,7 @@ owping tool class for pScheduler %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 906db87d23..ec3723385c 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: %{_pscheduler_python}-pscheduler >= 4.3.0 +Requires: python-pscheduler >= 4.3.0 Requires: pscheduler-test-trace Requires: paris-traceroute Requires: sudo -Requires: %{_pscheduler_python}-icmperror +Requires: 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 1de3c10813..20c78bcc19 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: %{_pscheduler_python}-pscheduler >= 4.3.0 +Requires: 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 c4cd19489f..2040fba82f 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: %{_pscheduler_python}-pscheduler >= 4.3.0 +Requires: python-pscheduler >= 4.3.0 Requires: pscheduler-test-rtt -Requires: %{_pscheduler_python}-icmperror +Requires: 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 1867830618..734cb5174c 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: %{_pscheduler_python}-pscheduler >= 4.3.0 +Requires: python-pscheduler >= 4.3.0 Requires: pscheduler-test-latencybg Requires: owamp-client Requires: owamp-server BuildRequires: pscheduler-rpm -BuildRequires: %{_pscheduler_python}-pscheduler -BuildRequires: %{_pscheduler_python_epel}-nose +BuildRequires: python-pscheduler +BuildRequires: python-nose %description powstream tool class for pScheduler @@ -44,7 +44,7 @@ powstream tool class for pScheduler %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 ff4913174e..a3723200dd 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: %{_pscheduler_python}-pscheduler >= 4.3.0 +Requires: 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 5b44d41aff..b2cbd14993 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: %{_pscheduler_python}-pscheduler >= 4.3.0 -Requires: %{_pscheduler_python}-pycurl +Requires: python-pscheduler >= 4.3.0 +Requires: python-pycurl BuildRequires: pscheduler-rpm @@ -44,7 +44,7 @@ pstimer tool class for pScheduler %build make \ DESTDIR=$RPM_BUILD_ROOT/%{dest} \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 bfba0057ee..75920df446 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: %{_pscheduler_python}-pscheduler >= 4.3.0 +Requires: 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 4e591efd6a..c87c58f564 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: %{_pscheduler_python}-pscheduler >= 4.3.0 -Requires: %{_pscheduler_python}-pysnmp +Requires: python-pscheduler >= 4.3.0 +Requires: 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 9cbbb560f8..a0e4350046 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: %{_pscheduler_python}-pscheduler +Requires: 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 39488c2ef7..b7687ff007 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: %{_pscheduler_python}-pscheduler >= 4.3.0 +Requires: 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 280f9e720a..494e7ad280 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: %{_pscheduler_python}-pscheduler >= 4.3.0 +Requires: 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 b7a13f6e2f..8a5e819db3 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: %{_pscheduler_python}-pscheduler >= 4.3.0 +Requires: 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 1e565c27e0..788ace5c51 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: %{_pscheduler_python}-pscheduler >= 4.3.0 +Requires: 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 bf3871544f..f8cea086dc 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: %{_pscheduler_python}-pscheduler >= 4.3.0 +Requires: python-pscheduler >= 4.3.0 Requires: pscheduler-test-rtt -Requires: %{_pscheduler_python}-icmperror +Requires: 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 fecdac0450..699a1c897e 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: %{_pscheduler_python}-pscheduler >= 4.3.0 +Requires: python-pscheduler >= 4.3.0 Requires: pscheduler-test-trace -Requires: %{_pscheduler_python}-icmperror +Requires: 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 4436652d1e..6a2bd82652 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: %{_pscheduler_python}-pscheduler >= 4.3.0 +Requires: python-pscheduler >= 4.3.0 Requires: pscheduler-test-trace -Requires: %{_pscheduler_python}-icmperror +Requires: 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 7a07df3c10..b3fcb665b1 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: %{_pscheduler_python}-pscheduler >= 4.3.0 +Requires: python-pscheduler >= 4.3.0 Requires: pscheduler-test-latency Requires: twamp-client BuildRequires: pscheduler-rpm -BuildRequires: %{_pscheduler_python}-pscheduler -BuildRequires: %{_pscheduler_python_epel}-nose +BuildRequires: python-pscheduler +BuildRequires: python-nose %description twping tool class for pScheduler @@ -41,7 +41,7 @@ twping tool class for pScheduler %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 1751e55743..0caa5d895a 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: %{_pscheduler_python}-pscheduler +Requires: 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 80f07464dc..bfe281ad5d 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: %{_pscheduler_python}-%{short} +Name: 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: %{_pscheduler_python} +Requires: python -BuildRequires: %{_pscheduler_python} -BuildRequires: %{_pscheduler_python}-pip -BuildRequires: %{_pscheduler_python}-setuptools -BuildRequires: %{_pscheduler_python}-wheel -BuildRequires: %{_pscheduler_python_epel}-docutils +BuildRequires: python +BuildRequires: python-pip +BuildRequires: python-setuptools +BuildRequires: python-wheel +BuildRequires: python-docutils %description Daemonizer library for Python @@ -41,11 +41,11 @@ Daemonizer library for Python %build -%{_pscheduler_python} setup.py build +python setup.py build %install -%{_pscheduler_python} setup.py install --root=$RPM_BUILD_ROOT --single-version-externally-managed -O1 --record=INSTALLED_FILES +python setup.py install --root=$RPM_BUILD_ROOT --single-version-externally-managed -O1 --record=INSTALLED_FILES %clean diff --git a/python-flask/unibuild-packaging/rpm/python-flask.spec b/python-flask/unibuild-packaging/rpm/python-flask.spec index 9516f14999..efc07cb792 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: %{_pscheduler_python}-%{short} +Name: 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: %{_pscheduler_python} -Requires: %{_pscheduler_python}-click -Requires: %{_pscheduler_python}-jinja2 -Requires: %{_pscheduler_python}-itsdangerous -Requires: %{_pscheduler_python}-werkzeug +Requires: python +Requires: python-click +Requires: python-jinja2 +Requires: python-itsdangerous +Requires: python-werkzeug -BuildRequires: %{_pscheduler_python} -BuildRequires: %{_pscheduler_python}-setuptools +BuildRequires: python +BuildRequires: python-setuptools %description Flask is called a “micro-framework” because the idea to keep the core @@ -49,11 +49,11 @@ authentication technologies and more. %build -%{_pscheduler_python} setup.py build +python setup.py build %install -%{_pscheduler_python} setup.py install \ +python setup.py install \ --root=$RPM_BUILD_ROOT \ --single-version-externally-managed \ -O1 \ diff --git a/python-icmperror/icmperror/unibuild-packaging/rpm/python-icmperror.spec b/python-icmperror/icmperror/unibuild-packaging/rpm/python-icmperror.spec index 8464264b69..d5168160f7 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: %{_pscheduler_python}-%{short} +Name: 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: %{_pscheduler_python} +Requires: python -BuildRequires: %{_pscheduler_python} -BuildRequires: %{_pscheduler_python}-setuptools +BuildRequires: python +BuildRequires: python-setuptools %description @@ -38,11 +38,11 @@ Functions for translating ICMP error codes to enumerated values %build -%{_pscheduler_python} setup.py build +python setup.py build %install -%{_pscheduler_python} setup.py install \ +python setup.py install \ --root=$RPM_BUILD_ROOT \ -O1 \ --record=INSTALLED_FILES diff --git a/python-itsdangerous/unibuild-packaging/rpm/python-itsdangerous.spec b/python-itsdangerous/unibuild-packaging/rpm/python-itsdangerous.spec index 5bc4c03917..92642a023b 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: %{_pscheduler_python}-%{short} +Name: 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: %{_pscheduler_python} +Requires: python -BuildRequires: %{_pscheduler_python} -BuildRequires: %{_pscheduler_python}-setuptools +BuildRequires: python +BuildRequires: python-setuptools %description @@ -39,11 +39,11 @@ JSON signature module %build -%{_pscheduler_python} setup.py build +python setup.py build %install -%{_pscheduler_python} setup.py install \ +python setup.py install \ --root=$RPM_BUILD_ROOT \ --single-version-externally-managed \ -O1 \ diff --git a/python-jsonschema/unibuild-packaging/rpm/python-jsonschema.spec b/python-jsonschema/unibuild-packaging/rpm/python-jsonschema.spec index fb50240772..5b848f184e 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: %{_pscheduler_python}-%{short} +Name: python-%{short} Version: 3.0.1 Release: 1%{?dist} Summary: JSON Schema library for Python @@ -13,7 +13,7 @@ Group: Development/Libraries Provides: %{name} = %{version}-%{release} Provides: python-%{short} = %{version}-%{release} -Provides: %{_pscheduler_python}-%{short} = %{version}-%{release} +Provides: python-%{short} = %{version}-%{release} Prefix: %{_prefix} Vendor: Julian Berman @@ -21,13 +21,13 @@ URL: http://pypi.python.org/pypi/jsonschema Source: %{short}-%{version}.tar.gz -Requires: %{_pscheduler_python} -Requires: %{_pscheduler_python}-pyrsistent +Requires: python +Requires: python-pyrsistent # This is required for some reason. -Requires: %{_pscheduler_python}-setuptools +Requires: python-setuptools -BuildRequires: %{_pscheduler_python} -BuildRequires: %{_pscheduler_python}-setuptools +BuildRequires: python +BuildRequires: python-setuptools %description @@ -45,11 +45,11 @@ JSON Schema library for Python %build -%{_pscheduler_python} setup.py build +python setup.py build %install -%{_pscheduler_python} setup.py install --root=$RPM_BUILD_ROOT -O1 --record=INSTALLED_FILES +python setup.py install --root=$RPM_BUILD_ROOT -O1 --record=INSTALLED_FILES # This package installs a binary that it really shouldn't because it # may overlap with the same file from other versions of the same diff --git a/python-jsontemplate/unibuild-packaging/rpm/python-jsontemplate.spec b/python-jsontemplate/unibuild-packaging/rpm/python-jsontemplate.spec index 81097788a6..5e7393ba1c 100644 --- a/python-jsontemplate/unibuild-packaging/rpm/python-jsontemplate.spec +++ b/python-jsontemplate/unibuild-packaging/rpm/python-jsontemplate.spec @@ -3,7 +3,7 @@ # %define short jsontemplate -Name: %{_pscheduler_python}-%{short} +Name: python-%{short} Version: 0.87 Release: 1%{?dist} Summary: Template system for JSON @@ -23,10 +23,10 @@ Patch0: %{short}-%{version}-00-2to3.patch Patch1: %{short}-%{version}-01-division.patch -Requires: %{_pscheduler_python} +Requires: python -BuildRequires: %{_pscheduler_python} -BuildRequires: %{_pscheduler_python}-setuptools +BuildRequires: python +BuildRequires: python-setuptools @@ -46,11 +46,11 @@ Template system for JSON %build -%{_pscheduler_python} setup.py build +python setup.py build %install -%{_pscheduler_python} setup.py install \ +python setup.py install \ --root=$RPM_BUILD_ROOT \ -O1 \ --record=INSTALLED_FILES diff --git a/python-kafka/unibuild-packaging/rpm/python-kafka.spec b/python-kafka/unibuild-packaging/rpm/python-kafka.spec index 77bf41049b..7c92caa8c9 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: %{_pscheduler_python}-%{short} +Name: 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: %{_pscheduler_python} +Requires: python -BuildRequires: %{_pscheduler_python} -BuildRequires: %{_pscheduler_python}-setuptools +BuildRequires: python +BuildRequires: 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. @@ -38,11 +38,11 @@ This module implements Apache Kafka producers and consumers in pure python, whic %build -%{_pscheduler_python} setup.py build +python setup.py build %install -%{_pscheduler_python} setup.py install --root=$RPM_BUILD_ROOT --single-version-externally-managed -O1 --record=INSTALLED_FILES +python setup.py install --root=$RPM_BUILD_ROOT --single-version-externally-managed -O1 --record=INSTALLED_FILES %clean diff --git a/python-nmap3/unibuild-packaging/rpm/python-nmap3.spec b/python-nmap3/unibuild-packaging/rpm/python-nmap3.spec index a6713331e4..f32f273abc 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: %{_pscheduler_python}-%{short} +Name: 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: %{_pscheduler_python} -Requires: %{_pscheduler_python}-wheel +Requires: python +Requires: python-wheel Requires: nmap -BuildRequires: %{_pscheduler_python} -BuildRequires: %{_pscheduler_python}-setuptools -BuildRequires: %{_pscheduler_python}-wheel +BuildRequires: python +BuildRequires: python-setuptools +BuildRequires: 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. @@ -42,11 +42,11 @@ A python 3 library which helps in using nmap port scanner. The way this tools wo %build -%{_pscheduler_python} setup.py build +python setup.py build %install -%{_pscheduler_python} setup.py install --root=$RPM_BUILD_ROOT --single-version-externally-managed -O1 --record=INSTALLED_FILES +python setup.py install --root=$RPM_BUILD_ROOT --single-version-externally-managed -O1 --record=INSTALLED_FILES %clean diff --git a/python-ntplib/unibuild-packaging/rpm/python-ntplib.spec b/python-ntplib/unibuild-packaging/rpm/python-ntplib.spec index c2c8de97fe..33929d9d51 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: %{_pscheduler_python}-%{short} +Name: 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: %{_pscheduler_python} +Requires: python -BuildRequires: %{_pscheduler_python} -BuildRequires: %{_pscheduler_python}-setuptools +BuildRequires: python +BuildRequires: python-setuptools @@ -42,11 +42,11 @@ Python. %build -%{_pscheduler_python} setup.py build +python setup.py build %install -%{_pscheduler_python} setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES -O1 +python setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES -O1 %clean diff --git a/python-parse-crontab/unibuild-packaging/rpm/python-parse-crontab.spec b/python-parse-crontab/unibuild-packaging/rpm/python-parse-crontab.spec index b004907666..e409e65c9c 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: %{_pscheduler_python}-%{short} +Name: 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: %{_pscheduler_python} +Requires: python -BuildRequires: %{_pscheduler_python} -BuildRequires: %{_pscheduler_python}-setuptools +BuildRequires: python +BuildRequires: python-setuptools @@ -42,11 +42,11 @@ time the job should be run. %build -%{_pscheduler_python} setup.py build +python setup.py build %install -%{_pscheduler_python} setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES -O1 +python setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES -O1 %clean diff --git a/python-pscheduler/pscheduler/unibuild-packaging/rpm/python-pscheduler.spec b/python-pscheduler/pscheduler/unibuild-packaging/rpm/python-pscheduler.spec index 8075c853ed..91ad71ee86 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: %{_pscheduler_python}-%{short} +Name: python-%{short} Version: %{perfsonar_auto_version} Release: %{perfsonar_auto_relnum}%{?dist} Summary: Utility functions for pScheduler @@ -27,51 +27,51 @@ Source0: %{short}-%{version}.tar.gz Requires: iputils -Requires: %{_pscheduler_python}-attrs -Requires: %{_pscheduler_python_epel}-dateutil -Requires: %{_pscheduler_python_epel}-dns -Requires: %{_pscheduler_python}-isodate -Requires: %{_pscheduler_python}-jsonschema >= 3.0 -Requires: %{_pscheduler_python_epel}-netaddr -Requires: %{_pscheduler_python}-netifaces -Requires: %{_pscheduler_python}-ntplib -Requires: %{_pscheduler_python_epel}-psutil -Requires: %{_pscheduler_python_epel}-psycopg2 >= 2.6.1 -Requires: %{_pscheduler_python}-py-radix +Requires: python-attrs +Requires: python-dateutil +Requires: python-dns +Requires: python-isodate +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 # The limit system uses this. Requires: pscheduler-jq-library -Requires: %{_pscheduler_python_epel}-pycurl -Requires: %{_pscheduler_python}-pyjq >= 2.2.0 -Requires: %{_pscheduler_python}-tzlocal -Requires: %{_pscheduler_python_epel}-pytz +Requires: python-pycurl +Requires: python-pyjq >= 2.2.0 +Requires: python-tzlocal +Requires: python-pytz Requires: rsyslog Requires: logrotate Requires: numactl BuildRequires: pscheduler-rpm -BuildRequires: %{_pscheduler_python} -BuildRequires: %{_pscheduler_python_epel}-coverage -BuildRequires: %{_pscheduler_python_epel}-nose -BuildRequires: %{_pscheduler_python}-setuptools +BuildRequires: python +BuildRequires: python-coverage +BuildRequires: python-nose +BuildRequires: python-setuptools # NOTE: Cloned from above. BuildRequires: iputils -BuildRequires: %{_pscheduler_python}-attrs -BuildRequires: %{_pscheduler_python_epel}-dateutil -BuildRequires: %{_pscheduler_python_epel}-dns -BuildRequires: %{_pscheduler_python}-isodate -BuildRequires: %{_pscheduler_python}-jsonschema -BuildRequires: %{_pscheduler_python_epel}-netaddr -BuildRequires: %{_pscheduler_python}-netifaces -BuildRequires: %{_pscheduler_python}-ntplib -BuildRequires: %{_pscheduler_python_epel}-psutil -BuildRequires: %{_pscheduler_python_epel}-psycopg2 >= 2.2.0 -BuildRequires: %{_pscheduler_python}-py-radix +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 # The limit system uses this. BuildRequires: pscheduler-jq-library -BuildRequires: %{_pscheduler_python_epel}-pycurl -BuildRequires: %{_pscheduler_python}-pyjq >= 2.2.0 -BuildRequires: %{_pscheduler_python}-tzlocal -BuildRequires: %{_pscheduler_python_epel}-pytz +BuildRequires: python-pycurl +BuildRequires: python-pyjq >= 2.2.0 +BuildRequires: python-tzlocal +BuildRequires: python-pytz BuildRequires: numactl %define limit_config %{_pscheduler_sysconfdir}/limits.conf @@ -101,7 +101,7 @@ make CLASSES="%{_pscheduler_classes}" %install -%{_pscheduler_python} setup.py install --root=$RPM_BUILD_ROOT -O1 --record=INSTALLED_FILES +python setup.py install --root=$RPM_BUILD_ROOT -O1 --record=INSTALLED_FILES mkdir -p $RPM_BUILD_ROOT/%{logrotate_d} cat > $RPM_BUILD_ROOT/%{logrotate_d}/%{name} < @@ -20,11 +20,11 @@ URL: https://github.com/etingof/pyasn1 Source: %{short}-%{version}.tar.gz -Requires: %{_pscheduler_python} -Requires: %{_pscheduler_python}-pyasn1 >= 0.4.5 +Requires: python +Requires: python-pyasn1 >= 0.4.5 -BuildRequires: %{_pscheduler_python} -BuildRequires: %{_pscheduler_python}-setuptools +BuildRequires: python +BuildRequires: python-setuptools %description ASN1 modules for Python @@ -41,11 +41,11 @@ ASN1 modules for Python %build -%{_pscheduler_python} setup.py build +python setup.py build %install -%{_pscheduler_python} setup.py install \ +python setup.py install \ --root=$RPM_BUILD_ROOT \ -O1 \ --record=INSTALLED_FILES diff --git a/python-pyasn1/unibuild-packaging/rpm/python-pyasn1.spec b/python-pyasn1/unibuild-packaging/rpm/python-pyasn1.spec index 3cf1e676eb..c3214aee20 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: %{_pscheduler_python}-%{short} +Name: python-%{short} Version: 0.4.5 Release: 1%{?dist} Summary: ASN1 for Python @@ -12,7 +12,7 @@ License: BSD Group: Development/Libraries Provides: %{name} = %{version}-%{release} -Provides: %{_pscheduler_python}-%{short} = %{version}-%{release} +Provides: python-%{short} = %{version}-%{release} Prefix: %{_prefix} Vendor: Ilya Etingof @@ -20,10 +20,10 @@ URL: https://github.com/etingof/pyasn1 Source: %{short}-%{version}.tar.gz -Requires: %{_pscheduler_python} +Requires: python -BuildRequires: %{_pscheduler_python} -BuildRequires: %{_pscheduler_python}-setuptools +BuildRequires: python +BuildRequires: python-setuptools %description ASN1 for Python @@ -40,11 +40,11 @@ ASN1 for Python %build -%{_pscheduler_python} setup.py build +python setup.py build %install -%{_pscheduler_python} setup.py install \ +python setup.py install \ --root=$RPM_BUILD_ROOT \ -O1 \ --record=INSTALLED_FILES diff --git a/python-pyjq/unibuild-packaging/rpm/python-pyjq.spec b/python-pyjq/unibuild-packaging/rpm/python-pyjq.spec index b72e7dce58..7c38d40f9e 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: %{_pscheduler_python}-%{short} +Name: 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: %{_pscheduler_python} +Requires: 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: %{_pscheduler_python} -BuildRequires: %{_pscheduler_python}-setuptools +BuildRequires: python +BuildRequires: python-setuptools BuildRequires: Cython >= 0.19 BuildRequires: jq-devel >= 1.5 BuildRequires: oniguruma-devel >= 5.9 @@ -59,11 +59,11 @@ Python bindings to JQ %build cython _pyjq.pyx -%{_pscheduler_python} setup.py build +python setup.py build %install -%{_pscheduler_python} setup.py install --root=$RPM_BUILD_ROOT -O1 --record=INSTALLED_FILES +python setup.py install --root=$RPM_BUILD_ROOT -O1 --record=INSTALLED_FILES %clean diff --git a/python-pyrsistent/unibuild-packaging/rpm/python-pyrsistent.spec b/python-pyrsistent/unibuild-packaging/rpm/python-pyrsistent.spec index 604c30e593..973f9f2e62 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: %{_pscheduler_python}-%{short} +Name: 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: %{_pscheduler_python} -Requires: %{_pscheduler_python_epel}-six +Requires: python +Requires: python-six -BuildRequires: %{_pscheduler_python_epel}-six -BuildRequires: %{_pscheduler_python} -BuildRequires: %{_pscheduler_python}-devel -BuildRequires: %{_pscheduler_python}-setuptools +BuildRequires: python-six +BuildRequires: python +BuildRequires: python-devel +BuildRequires: python-setuptools %description Pyrsistent is a number of persistent collections (by some referred to @@ -47,11 +47,11 @@ immutable. %build -%{_pscheduler_python} setup.py build +python setup.py build %install -%{_pscheduler_python} setup.py install --root=$RPM_BUILD_ROOT -O1 --record=INSTALLED_FILES +python setup.py install --root=$RPM_BUILD_ROOT -O1 --record=INSTALLED_FILES %clean diff --git a/python-pysnmp/unibuild-packaging/rpm/pysnmp.spec b/python-pysnmp/unibuild-packaging/rpm/pysnmp.spec index 7423be24ad..6e6cea9121 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: %{_pscheduler_python}-%{short} +Name: 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: %{_pscheduler_python} -Requires: %{_pscheduler_python}-pyasn1 >= 0.3.7 +Requires: python +Requires: python-pyasn1 >= 0.3.7 -BuildRequires: %{_pscheduler_python} -BuildRequires: %{_pscheduler_python}-setuptools +BuildRequires: python +BuildRequires: python-setuptools %description @@ -39,11 +39,11 @@ Python library for SNMP %build -%{_pscheduler_python} setup.py build +python setup.py build %install -%{_pscheduler_python} setup.py install \ +python setup.py install \ --root=$RPM_BUILD_ROOT \ --record=INSTALLED_FILES \ -O1 diff --git a/python-tzlocal/unibuild-packaging/rpm/python-tzlocal.spec b/python-tzlocal/unibuild-packaging/rpm/python-tzlocal.spec index b25a0d5f4f..77c8a25477 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: %{_pscheduler_python}-%{short} +Name: 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: %{_pscheduler_python} -BuildRequires: %{_pscheduler_python}-setuptools +BuildRequires: python +BuildRequires: python-setuptools -Requires: %{_pscheduler_python} +Requires: python %description @@ -40,11 +40,11 @@ information under Unix and Win-32. %build -%{_pscheduler_python} setup.py build +python setup.py build %install -%{_pscheduler_python} setup.py install \ +python setup.py install \ --root=$RPM_BUILD_ROOT \ --single-version-externally-managed -O1 \ --record=INSTALLED_FILES diff --git a/python-vcversioner/unibuild-packaging/rpm/python-vcversioner.spec b/python-vcversioner/unibuild-packaging/rpm/python-vcversioner.spec index 10fbe6a935..5e0a037268 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: %{_pscheduler_python}-%{short} +Name: 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: %{_pscheduler_python} +Requires: python -BuildRequires: %{_pscheduler_python} -BuildRequires: %{_pscheduler_python}-setuptools +BuildRequires: python +BuildRequires: python-setuptools %description @@ -39,11 +39,11 @@ Python version extractor %build -%{_pscheduler_python} setup.py build +python setup.py build %install -%{_pscheduler_python} setup.py install \ +python setup.py install \ --root=$RPM_BUILD_ROOT \ --single-version-externally-managed \ -O1 \ diff --git a/python-vine/unibuild-packaging/rpm/python-vine.spec b/python-vine/unibuild-packaging/rpm/python-vine.spec index eeb16cc2e1..b1b03d70cf 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: %{_pscheduler_python}-%{short} +Name: 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: %{_pscheduler_python} +Requires: python -BuildRequires: %{_pscheduler_python} -BuildRequires: %{_pscheduler_python}-setuptools +BuildRequires: python +BuildRequires: python-setuptools %description A pure Python library implementing promises @@ -37,11 +37,11 @@ A pure Python library implementing promises %build -%{_pscheduler_python} setup.py build +python setup.py build %install -%{_pscheduler_python} setup.py install --root=$RPM_BUILD_ROOT --single-version-externally-managed -O1 --record=INSTALLED_FILES +python setup.py install --root=$RPM_BUILD_ROOT --single-version-externally-managed -O1 --record=INSTALLED_FILES %clean diff --git a/python-werkzeug/unibuild-packaging/rpm/python-werkzeug.spec b/python-werkzeug/unibuild-packaging/rpm/python-werkzeug.spec index 3b9162f6eb..57ef80f34d 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: %{_pscheduler_python}-%{short} +Name: python-%{short} Version: 0.15.5 Release: 1%{?dist} BuildArch: noarch @@ -19,17 +19,17 @@ Prefix: %{_prefix} Source: %{short}-%{version}.tar.gz -Requires: %{_pscheduler_python} -BuildRequires: %{_pscheduler_python}-devel -BuildRequires: %{_pscheduler_python}-setuptools +Requires: python +BuildRequires: python-devel +BuildRequires: 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: %{_pscheduler_python}-sphinx +BuildRequires: python-sphinx %endif -BuildRequires: %{_pscheduler_python}-setuptools +BuildRequires: python-setuptools %description Werkzeug @@ -60,11 +60,11 @@ bulletin boards, etc.). %build -%{_pscheduler_python} setup.py build +python setup.py build %install -%{_pscheduler_python} setup.py install --root=$RPM_BUILD_ROOT --single-version-externally-managed -O1 --record=INSTALLED_FILES +python setup.py install --root=$RPM_BUILD_ROOT --single-version-externally-managed -O1 --record=INSTALLED_FILES %clean 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 9276b562a7..84a7810683 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,8 +29,8 @@ Provides: %{name} = %{version}-%{release} # Include all required libraries here Requires: pscheduler-server -Requires: %{_pscheduler_python}-pscheduler >= 1.3 -Requires: %{_pscheduler_python}-jsontemplate +Requires: python-pscheduler >= 1.3 +Requires: python-jsontemplate BuildRequires: pscheduler-rpm @@ -47,7 +47,7 @@ __PLUGIN_NAME__ test class for pScheduler %build make \ - PYTHON=%{_pscheduler_python} \ + PYTHON=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 da3f540584..6c8ee7212c 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: %{_pscheduler_python}-pscheduler +Requires: python-pscheduler BuildRequires: pscheduler-rpm