Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-25 16:58:04 +02:00
Code Issues Projects Releases Wiki Activity

2017-04-11 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added a mysql/mariadb dependency in 'rivendell.spec.in'.
This commit is contained in:
Fred Gleason 2017-04-11 12:19:13 -04:00
parent cd5259e08c
commit 9062c6f816
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -15731,3 +15731,5 @@
* Fixed a bug in 'lib/rduser.cpp' that broke the build on Windows.
2017-04-11 Fred Gleason <fredg@paravelsystems.com>
* Incremented the package version to 2.15.3int01.
2017-04-11 Fred Gleason <fredg@paravelsystems.com>
* Added a mysql/mariadb dependency in 'rivendell.spec.in'.

4
configure.ac
View File

@ -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")

2
rivendell.spec.in
View File

@ -26,7 +26,7 @@ License: GPL
Packager: Fred Gleason <fredg@paravelsystems.com>
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