Spec fixes for Oracle 8 port. #1421

perfsonar · Mar 20, 2024 · ec82458 · ec82458
1 parent 2105d61
commit ec82458
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 8 deletions.
diff --git a/pscheduler-server/pscheduler-server/unibuild-packaging/rpm/pscheduler-server.spec b/pscheduler-server/pscheduler-server/unibuild-packaging/rpm/pscheduler-server.spec
@@ -253,7 +253,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_pscheduler_log_dir}
 #
 # API Server
 #
-API_ROOT="$(python -c 'import pscheduler ; print(pscheduler.api_root())')"
+API_ROOT="$(%{_pscheduler_python} -c 'import pscheduler ; print(pscheduler.api_root())')"
 
 make -C api-server \
      'USER_NAME=%{_pscheduler_user}' \
@@ -264,7 +264,7 @@ make -C api-server \
      "PREFIX=${RPM_BUILD_ROOT}" \
      "DSN_FILE=%{dsn_file}" \
      "LIMITS_FILE=%{_pscheduler_limit_config}" \
-     "PYTHON=%(command -v python)" \
+     "PYTHON=%(command -v %{_pscheduler_python})" \
      "RUN_DIR=%{run_dir}" \
      install
 
@@ -582,7 +582,7 @@ fi
 # Any upgrade of python-pscheduler needs to force a database restart
 # because Pg doesn't see module upgrades.
 
-%triggerin -- python-pscheduler
+%triggerin -- %{_pscheduler_python}-pscheduler
 systemctl reload-or-try-restart postgresql
 
 # ------------------------------------------------------------------------------

diff --git a/python-jsonschema/unibuild-packaging/rpm/python-jsonschema.spec b/python-jsonschema/unibuild-packaging/rpm/python-jsonschema.spec
@@ -12,8 +12,6 @@ License:	MIT
 Group:		Development/Libraries
 
 Provides:	%{name} = %{version}-%{release}
-Provides:	python-%{short} = %{version}-%{release}
-Provides:	python-%{short} = %{version}-%{release}
 Prefix:		%{_prefix}
 
 Vendor:		Julian Berman

diff --git a/python-pyasn1-modules/unibuild-packaging/rpm/python-pyasn1-modules.spec b/python-pyasn1-modules/unibuild-packaging/rpm/python-pyasn1-modules.spec
@@ -12,7 +12,6 @@ License:	BSD
 Group:		Development/Libraries
 
 Provides:	%{name} = %{version}-%{release}
-Provides:	python-%{short} = %{version}-%{release}
 Prefix:		%{_prefix}
 
 Vendor:		Ilya Etingof <[email protected]>

diff --git a/python-pyasn1/unibuild-packaging/rpm/python-pyasn1.spec b/python-pyasn1/unibuild-packaging/rpm/python-pyasn1.spec
@@ -12,7 +12,6 @@ License:	BSD
 Group:		Development/Libraries
 
 Provides:	%{name} = %{version}-%{release}
-Provides:	python-%{short} = %{version}-%{release}
 Prefix:		%{_prefix}
 
 Vendor:		Ilya Etingof <[email protected]>

diff --git a/python-pyrsistent/unibuild-packaging/rpm/python-pyrsistent.spec b/python-pyrsistent/unibuild-packaging/rpm/python-pyrsistent.spec
@@ -13,7 +13,6 @@ License:	MIT
 Group:		Development/Libraries
 
 Provides:	%{name} = %{version}-%{release}
-Provides:	python-%{short} = %{version}-%{release}
 Prefix:		%{_prefix}
 
 Vendor:		Tobias Gustaffson