diff --git a/ChangeLog b/ChangeLog index d0562354..7e8bf61d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15731,3 +15731,5 @@ * Fixed a bug in 'lib/rduser.cpp' that broke the build on Windows. 2017-04-11 Fred Gleason * Incremented the package version to 2.15.3int01. +2017-04-11 Fred Gleason + * Added a mysql/mariadb dependency in 'rivendell.spec.in'. diff --git a/configure.ac b/configure.ac index 52815ef6..8cf81505 100644 --- a/configure.ac +++ b/configure.ac @@ -115,6 +115,7 @@ if test $ar_gcc_distro = suse ; then AC_SUBST(APACHE_CONFIG_DIR,"/etc/apache2/conf.d") AC_SUBST(CONSOLEHELPER_RDALSACONFIG,"") AC_SUBST(USERMODE_PKG,"") + AC_SUBST(MYSQL_PKG,"mysql") AC_SUBST(QT3_MYSQL_PKG,"qt3-mysql") AC_SUBST(QT3_DEVEL_PKG,"qt3-devel") AC_SUBST(MYSQL_PKG,"mysql") @@ -124,17 +125,20 @@ else AC_SUBST(CONSOLEHELPER_RDALSACONFIG,"/usr/bin/rdalsaconfig-root") if test $ar_distro_major -ge 7 ; then AC_SUBST(USERMODE_PKG,"usermode usermode-gtk") + AC_SUBST(MYSQL_PKG,"mariadb") AC_SUBST(QT3_MYSQL_PKG,"qt3-MySQL") AC_SUBST(QT3_DEVEL_PKG,"qt3-devel") AC_SUBST(MYSQL_PKG,"mariadb") else if test $ar_distro_major -ge 6 ; then AC_SUBST(USERMODE_PKG,"usermode") + AC_SUBST(MYSQL_PKG,"mysql") AC_SUBST(QT3_MYSQL_PKG,"qt-MySQL") AC_SUBST(QT3_DEVEL_PKG,"qt3-devel") AC_SUBST(MYSQL_PKG,"mysqld") else AC_SUBST(USERMODE_PKG,"usermode") + AC_SUBST(MYSQL_PKG,"mysql") AC_SUBST(QT3_MYSQL_PKG,"qt-MySQL") AC_SUBST(QT3_DEVEL_PKG,"qt-devel") AC_SUBST(MYSQL_PKG,"mysqld") diff --git a/rivendell.spec.in b/rivendell.spec.in index 8fbe5e42..cefbb0e2 100644 --- a/rivendell.spec.in +++ b/rivendell.spec.in @@ -26,7 +26,7 @@ License: GPL Packager: Fred Gleason Group: Productivity/Multimedia/Other Source: rivendell-@VERSION@.tar.gz -Requires: @QT3_MYSQL_PKG@ @APACHE_PKG@ @QT3_DEVEL_PKG@ curl @USERMODE_PKG@ rivendell-base +Requires: @MYSQL_PKG@ @QT3_MYSQL_PKG@ @APACHE_PKG@ @QT3_DEVEL_PKG@ curl @USERMODE_PKG@ rivendell-base BuildRoot: /var/tmp/rivendell-@VERSION@ %package base