From 569aa1c5ba21a1b5161b7d814ee0b7b6fd47521b Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Mon, 22 Apr 2019 16:26:20 -0400 Subject: [PATCH] 2019-04-22 Fred Gleason * Modified 'rivendell.spec.in' to pin the Python version used on RHEL 7 to 3.4. --- ChangeLog | 3 +++ configure.ac | 3 ++- rivendell.spec.in | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7949da06..2d479092 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18576,3 +18576,6 @@ when altering a table's charset/collation. 2019-04-22 Fred Gleason * Added a commented out debug printf the in 'RDSqlQuery' constructor. +2019-04-22 Fred Gleason + * Modified 'rivendell.spec.in' to pin the Python version used on + RHEL 7 to 3.4. diff --git a/configure.ac b/configure.ac index d28a5ba3..c0a07337 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl dnl Autoconf configuration for Rivendell. dnl Use autoconf to process this into a configure script dnl -dnl (C) Copyright 2002-2018 Fred Gleason +dnl (C) Copyright 2002-2019 Fred Gleason dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License version 2 as @@ -251,6 +251,7 @@ AC_CHECK_HEADER(soundtouch/SoundTouch.h,[],[AC_MSG_ERROR([*** SoundTouch not fou # Check for Python # AM_PATH_PYTHON([3]) +AC_SUBST(PYTHON_BASE_DEP,"python"`echo $PYTHON_VERSION | sed -e s/3./3/`) # # Check for runuser(1) diff --git a/rivendell.spec.in b/rivendell.spec.in index 2be37fec..3f5f8987 100644 --- a/rivendell.spec.in +++ b/rivendell.spec.in @@ -19,7 +19,7 @@ ## # So python bytecompilation works correctly -%define __python @PYTHON@ +%define __python /usr/bin/python3.4 Summary: Radio Broadcast Automation System Name: rivendell @@ -109,6 +109,7 @@ associated with. %build +export PYTHON=/usr/bin/python3.4 %configure --libexecdir=@libexecdir@ --sysconfdir=@sysconfdir@ @RDXPORTDEBUG@ make -j 10