Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-08-07 07:39:33 +02:00
Code Issues Projects Releases Wiki Activity

2021-05-10 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Updated the dependency for the MySQL Qt plug-in for RPM
	packages.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-05-10 13:36:05 -04:00
parent 5b270dcba5
commit 8a8fc81420
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -21657,3 +21657,6 @@
SQL errors.
* Fixed typos in 'utils/rddbmgr/updateschema.cpp' that caused SQL
errors.
2021-05-10 Fred Gleason <fredg@paravelsystems.com>
* Updated the dependency for the MySQL Qt plug-in for RPM
packages.

14
configure.ac
View File

@ -169,7 +169,7 @@ if test $ar_gcc_distro = suse ; then
# AC_SUBST(CONSOLEHELPER_RDALSACONFIG,"")
AC_SUBST(USERMODE_PKG,"")
AC_SUBST(MYSQL_PKG,"mysql")
AC_SUBST(QT4_MYSQL_PKG,"qt-mysql")
AC_SUBST(QT_MYSQL_PKG,"qt-mysql")
AC_SUBST(DOC_PATH,"/usr/share/doc/rivendell")
else
AC_SUBST(APACHE_PKG,"httpd")
@ -178,17 +178,7 @@ else
if test $ar_distro_major -ge 7 ; then
AC_SUBST(USERMODE_PKG,"usermode usermode-gtk")
AC_SUBST(MYSQL_PKG,"mariadb")
AC_SUBST(QT4_MYSQL_PKG,"qt-mysql")
else
if test $ar_distro_major -ge 6 ; then
AC_SUBST(USERMODE_PKG,"usermode")
AC_SUBST(MYSQL_PKG,"mysql")
AC_SUBST(QT4_MYSQL_PKG,"qt4-mysql")
else
AC_SUBST(USERMODE_PKG,"usermode")
AC_SUBST(MYSQL_PKG,"mysql")
AC_SUBST(QT4_MYSQL_PKG,"qt-MySQL")
fi
AC_SUBST(QT_MYSQL_PKG,"qt5-qtbase-mysql")
fi
fi

2
rivendell.spec.in
View File

@ -28,7 +28,7 @@ Release: @RPM_RELEASE@
License: GPL
Packager: Fred Gleason <fredg@paravelsystems.com>
Source: rivendell-@VERSION@.tar.gz
Requires: @MYSQL_PKG@, @QT4_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
BuildRoot: /var/tmp/rivendell-@VERSION@
Obsoletes: rivendell-base rivendell-opsguide
Conflicts: rivendell-opsguide