2021-09-25 Fred Gleason <fredg@paravelsystems.com>

* Changed the shebang path in 'scripts/init_template_host.py' from
	'/usr/bin/python' to '/usr/bin/python3'.
	* Changed the shebang path in 'scripts/engine_conv.py' from
	'/usr/bin/python' to '/usr/bin/python3'.
	* Added 'qt5-qtbase-devel' and 'qt5-linguist' build dependencies
	to 'rivendell.spec.in'.

Signed-off-by: Fred Gleason <fredg@paraelsystems.com>
This commit is contained in:
Fred Gleason 2021-09-25 16:26:39 -04:00
parent 64e0a99bef
commit fb02fdb3fa
6 changed files with 26 additions and 9 deletions

View File

@ -22463,3 +22463,10 @@
2021-09-24 Fred Gleason <fredg@paravelsystems.com>
* Added a 'RedHat Enterprise Linux 8' subsection to the
'DISTRO-SPECIFIC NOTES' section of 'INSTALL'.
2021-09-25 Fred Gleason <fredg@paravelsystems.com>
* Changed the shebang path in 'scripts/init_template_host.py' from
'/usr/bin/python' to '/usr/bin/python3'.
* Changed the shebang path in 'scripts/engine_conv.py' from
'/usr/bin/python' to '/usr/bin/python3'.
* Added 'qt5-qtbase-devel' and 'qt5-linguist' build dependencies
to 'rivendell.spec.in'.

View File

@ -274,7 +274,7 @@ Configure script invocation: ./configure --prefix=/usr --libdir=/usr/lib64 --lib
2) RedHat Enterprise Linux 8
Required build packages: git gcc-c++ automake autoconf libtool qt5-qtbase-devel qt5-qtbase-mysql libcurl-devel cdparanoia-devel alsa-lib-devel libsamplerate-devel libsndfile-devel libvorbis-devel flac-devel pam-devel soundtouch-devel twolame-devel libmad-devel lame-devel rpm-build createrepo libxslt kernel-devel rpm-sign man-pages openssl-devel taglib-devel libmusicbrainz5-devel id3lib-devel libdiscid-devel libcoverart libcoverart-devel jack2-devel docbook5-style-xsl
Required build packages: git gcc-c++ automake autoconf libtool qt5-qtbase-devel qt5-linguist qt5-qtbase-mysql libcurl-devel cdparanoia-devel alsa-lib-devel libsamplerate-devel libsndfile-devel libvorbis-devel flac-devel pam-devel soundtouch-devel twolame-devel libmad-devel lame-devel rpm-build createrepo libxslt kernel-devel rpm-sign man-pages openssl-devel taglib-devel libmusicbrainz5-devel id3lib-devel libdiscid-devel libcoverart libcoverart-devel jack2-devel docbook5-style-xsl hpklinux-devel
Configure script invocation: ./configure --prefix=/usr --libdir=/usr/lib64 --libexecdir=/var/www/rd-bin --sysconfdir=/etc/httpd/conf.d

View File

@ -163,6 +163,7 @@ case "$ar_distro_id" in
AC_SUBST(HAVE_USERMODE,"no")
AC_SUBST(RDALSACONFIG_DESKTOP_FILE,"rivendell-rdalsaconfig-sudo.desktop")
AC_SUBST(RDDBCONFIG_DESKTOP_FILE,"rivendell-rddbconfig-sudo.desktop")
AC_SUBST(PYPAD_DEPS,"python3 python3-pycurl python3-requests python3-pyserial python3-mysql python3-urllib3")
;;
raspbian)
@ -179,6 +180,7 @@ case "$ar_distro_id" in
AC_SUBST(HAVE_USERMODE,"no")
AC_SUBST(RDALSACONFIG_DESKTOP_FILE,"rivendell-rdalsaconfig-sudo.desktop")
AC_SUBST(RDDBCONFIG_DESKTOP_FILE,"rivendell-rddbconfig-sudo.desktop")
AC_SUBST(PYPAD_DEPS,"python3 python3-pycurl python3-requests python3-pyserial python3-mysql python3-urllib3")
;;
ubuntu)
@ -195,6 +197,7 @@ case "$ar_distro_id" in
AC_SUBST(HAVE_USERMODE,"no")
AC_SUBST(RDALSACONFIG_DESKTOP_FILE,"rivendell-rdalsaconfig-sudo.desktop")
AC_SUBST(RDDBCONFIG_DESKTOP_FILE,"rivendell-rddbconfig-sudo.desktop")
AC_SUBST(PYPAD_DEPS,"python3 python3-pycurl python3-requests python3-pyserial python3-mysql python3-urllib3")
;;
centos|fedora|rhel|rocky)
@ -221,7 +224,12 @@ case "$ar_distro_id" in
AC_SUBST(HAVE_USERMODE,"yes")
AC_SUBST(RDALSACONFIG_DESKTOP_FILE,"rivendell-rdalsaconfig-root.desktop")
AC_SUBST(RDDBCONFIG_DESKTOP_FILE,"rivendell-rddbconfig-root.desktop")
;;
if test $ar_distro_major -lt 8 ; then
AC_SUBST(PYPAD_DEPS,"python36 python36-pycurl python36-requests python36-pyserial python36-mysql python36-urllib3")
else
AC_SUBST(PYPAD_DEPS,"python3 python3-pycurl python3-requests python3-pyserial python3-mysql python3-urllib3")
fi
;;
*)
AC_MSG_NOTICE([Distro is unknown])
@ -235,6 +243,7 @@ case "$ar_distro_id" in
AC_SUBST(HAVE_USERMODE,"no")
AC_SUBST(RDALSACONFIG_DESKTOP_FILE,"rivendell-rdalsaconfig.desktop")
AC_SUBST(RDDBCONFIG_DESKTOP_FILE,"rivendell-rddbconfig.desktop")
AC_SUBST(PYPAD_DEPS,"python3 python3-pycurl python3-requests python3-pyserial python3-mysql python3-urllib3")
;;
esac

View File

@ -30,14 +30,15 @@ Release: @RPM_RELEASE@
License: GPL
Packager: Fred Gleason <fredg@paravelsystems.com>
Source: rivendell-@VERSION@.tar.gz
Requires: @MYSQL_PKG@, @QT_MYSQL_PKG@, @APACHE_PKG@, curl, @USERMODE_PKG@, rivendell-pypad = @VERSION@, rsyslog
Requires: @MYSQL_PKG@ @QT_MYSQL_PKG@ @APACHE_PKG@ curl @USERMODE_PKG@ rivendell-pypad = @VERSION@ rsyslog
BuildRequires: qt5-qtbase-devel qt5-linguist
BuildRoot: /var/tmp/rivendell-@VERSION@
Obsoletes: rivendell-base rivendell-opsguide
Conflicts: rivendell-opsguide
%package importers
Summary: Library importers for the Rivendell Broadcast Automation System
Requires: rivendell = @VERSION@, madplay
Requires: rivendell = @VERSION@ madplay
%package opsguide
Summary: Rivendell Operations and Administration Guide
@ -49,15 +50,15 @@ Summary: Client libraries for interfacing with Rivendell's Web API.
%package devel
Summary: Header files and example code for development with Rivendell APIs
Requires: rivendell = @VERSION@, rivendell-webapi = @VERSION@
Requires: rivendell = @VERSION@ rivendell-webapi = @VERSION@
%package pypad
Summary: PyPAD Program Associated Data script system for Rivendell
Requires: python36, python36-pycurl, python36-requests, python36-pyserial, python36-mysql python36-urllib3
Requires: @PYPAD_DEPS@
%package select
Summary: The RDSelect system selector tool for Rivendell.
Requires: rivendell = @VERSION@, autofs
Requires: rivendell = @VERSION@ autofs
%package webget
Summary: The WebGet audio fetcher service for Rivendell

View File

@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python3
# engine_conv.py
#

View File

@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python3
# init_template_host.py
#