Makefile and spec file changes to build with Python 3/RHEL 8

Author: matyasselmeci

Makefile

@@ -13,6 +13,8 @@ VERSION := 3.0.0
 # Other configuration: May need to change for a release
 # ------------------------------------------------------------------------------
 
+PYTHON = python
+
 SBIN_FILES := osg-test osg-test-log-viewer
 INSTALL_SBIN_DIR := usr/sbin
 
@@ -50,7 +52,7 @@ TARBALL_DIR := $(PACKAGE)-$(VERSION)
 TARBALL_NAME := $(PACKAGE)-$(VERSION).tar.gz
 UPSTREAM := /p/vdt/public/html/upstream
 UPSTREAM_DIR := $(UPSTREAM)/$(PACKAGE)/$(VERSION)
-INSTALL_PYTHON_DIR := $(shell python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib()')
+INSTALL_PYTHON_DIR := $(shell $(PYTHON) -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())')
 
 
 # ------------------------------------------------------------------------------

osg-test-log-viewer

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 """View the output from osg-test in a structured way"""
 from __future__ import print_function
 

rpm/osg-test.spec

@@ -20,17 +20,33 @@ installation.
 %package log-viewer
 Summary:   Views the output of %{name}
 Group:     Applications/Grid
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
+Requires: python3-tkinter
+Requires: python3-six
+%else
 Requires:  tkinter
 Requires:  python-six
+%endif
 
 %description log-viewer
 A GUI for viewing the output of %{name} in a structured manner.
 
+%if 0%{?rhel} >= 8
+  %define __python /usr/libexec/platform-python
+%else
+  %if 0%{?fedora} >= 31
+    %define __python /usr/bin/python3
+  %else
+    %define __python /usr/bin/python2
+  %endif
+%endif
+
 %prep
 %setup -q
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+find . -type f -exec sed -ri '1s,^#!/usr/bin/env python,#!%{__python},' '{}' +
+make install DESTDIR=$RPM_BUILD_ROOT PYTHON=%{__python}
 %if 0%{?fedora} < 25 && 0%{?rhel} < 8
 rm -rf $RPM_BUILD_ROOT%{python_sitelib}/osgtest/vendor
 %endif