Removed EL6/7/8 Python naming accommodations. #1385

perfsonar · Jan 10, 2024 · 3be0bdd · 3be0bdd
1 parent a82b2b8
commit 3be0bdd
Show file tree

Hide file tree

Showing 102 changed files with 380 additions and 396 deletions.
diff --git a/...er-archiver-bitbucket/bitbucket/unibuild-packaging/rpm/pscheduler-archiver-bitbucket.spec b/...er-archiver-bitbucket/bitbucket/unibuild-packaging/rpm/pscheduler-archiver-bitbucket.spec
@@ -21,7 +21,7 @@ Source0:	%{short}-%{version}.tar.gz
 Provides:	%{name} = %{version}-%{release}
 
 Requires:	pscheduler-server >= 1.1.6
-Requires:	%{_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
@@ -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
@@ -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
@@ -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
@@ -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/...archiver-postgresql/postgresql/unibuild-packaging/rpm/pscheduler-archiver-postgresql.spec b/...archiver-postgresql/postgresql/unibuild-packaging/rpm/pscheduler-archiver-postgresql.spec
@@ -20,7 +20,7 @@ Source0:	%{short}-%{version}.tar.gz
 Provides:	%{name} = %{version}-%{release}
 
 Requires:	pscheduler-server >= 1.0.2
-Requires:	%{_pscheduler_python_epel}-psycopg2 >= 2.6.1
+Requires:	python-psycopg2 >= 2.6.1
 
 BuildRequires:	pscheduler-rpm
 

diff --git a/...duler-archiver-rabbitmq/rabbitmq/unibuild-packaging/rpm/pscheduler-archiver-rabbitmq.spec b/...duler-archiver-rabbitmq/rabbitmq/unibuild-packaging/rpm/pscheduler-archiver-rabbitmq.spec
@@ -21,9 +21,9 @@ Source0:	%{short}-%{version}.tar.gz
 Provides:	%{name} = %{version}-%{release}
 
 Requires:	pscheduler-server >= 1.1.6
-Requires:	%{_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/...duler-archiver-snmptrap/snmptrap/unibuild-packaging/rpm/pscheduler-archiver-snmptrap.spec b/...duler-archiver-snmptrap/snmptrap/unibuild-packaging/rpm/pscheduler-archiver-snmptrap.spec
@@ -21,8 +21,8 @@ Source0:	%{short}-%{version}.tar.gz
 Provides:	%{name} = %{version}-%{release}
 
 Requires:	pscheduler-server
-Requires:	%{_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
@@ -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
@@ -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/...r-context-changefail/changefail/unibuild-packaging/rpm/pscheduler-context-changefail.spec b/...r-context-changefail/changefail/unibuild-packaging/rpm/pscheduler-context-changefail.spec
@@ -21,7 +21,7 @@ Source0:	%{short}-%{version}.tar.gz
 Provides:	%{name} = %{version}-%{release}
 
 Requires:	pscheduler-server
-Requires:	%{_pscheduler_python}-pscheduler
+Requires:	python-pscheduler
 
 BuildRequires:	pscheduler-rpm >= 1.0.0.5.1
 

diff --git a/...-changenothing/changenothing/unibuild-packaging/rpm/pscheduler-context-changenothing.spec b/...-changenothing/changenothing/unibuild-packaging/rpm/pscheduler-context-changenothing.spec
@@ -21,7 +21,7 @@ Source0:	%{short}-%{version}.tar.gz
 Provides:	%{name} = %{version}-%{release}
 
 Requires:	pscheduler-server
-Requires:	%{_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
@@ -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
@@ -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
@@ -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
@@ -35,24 +35,6 @@ cat > $RPM_BUILD_ROOT/%{macro_prefix}%{name} <<EOF
 #
 
 
-#
-# Python
-#
-
-# This is the version we like.
-%%_pscheduler_python_version_major 3
-%%_pscheduler_python_version_minor 6
-
-
-# TODO: Clean use of this out of the RPM specs
-
-# This is a hold-over from the bad old days when there were
-# inconsistencies in how repos named packages.  By EL9, everything was
-# the same name.
-%%_pscheduler_python python
-%%_pscheduler_python_epel python
-
-
 #
 # PostgreSQL
 #
@@ -71,7 +53,9 @@ cat > $RPM_BUILD_ROOT/%{macro_prefix}%{name} <<EOF
 %%_pscheduler_postgresql_service postgresql
 %%_pscheduler_postgresql_data %%{_pscheduler_postgresql_data_top}/data
 %%_pscheduler_postgresql_initdb postgresql-setup --initdb
-%%_pscheduler_postgresql_plpython %%{_pscheduler_postgresql_package}-plpython%%{_pscheduler_python_version_major}
+
+# PostgreSQL still specifies the version number in the package.
+%%_pscheduler_postgresql_plpython %%{_pscheduler_postgresql_package}-plpython3
 
 %%_pscheduler_postgresql_version_file %%{_pscheduler_postgresql_data}/PG_VERSION
 

diff --git a/pscheduler-server/pscheduler-server/unibuild-packaging/rpm/pscheduler-server.spec b/pscheduler-server/pscheduler-server/unibuild-packaging/rpm/pscheduler-server.spec
@@ -54,30 +54,30 @@ Requires:	curl
 Requires:	psmisc
 Requires:	pscheduler-account
 # This is from EPEL but doesn't have a python36 prefix
-Requires:	%{_pscheduler_python}-daemon
-Requires:	%{_pscheduler_python}-flask
-Requires:	%{_pscheduler_python}-jsontemplate
-Requires:	%{_pscheduler_python_epel}-psutil
+Requires:	python-daemon
+Requires:	python-flask
+Requires:	python-jsontemplate
+Requires:	python-psutil
 
 # API Server
 BuildRequires:	pscheduler-account
 BuildRequires:	pscheduler-rpm
-BuildRequires:	%{_pscheduler_python}-parse-crontab
-BuildRequires:	%{_pscheduler_python}-pscheduler >= 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
 # python-pscheduler, but this package is what does the serving, so
 # mod_ssl is required here.
 Requires:	mod_ssl
 Requires:	mod_wsgi > 4.0
-Requires:	%{_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
@@ -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
@@ -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/...r-test-disk-to-disk/disk-to-disk/unibuild-packaging/rpm/pscheduler-test-disk-to-disk.spec b/...r-test-disk-to-disk/disk-to-disk/unibuild-packaging/rpm/pscheduler-test-disk-to-disk.spec
@@ -29,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
@@ -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
@@ -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
@@ -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