Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-12 07:35:55 +01:00
Code Issues Projects Releases Wiki Activity

2017-05-18 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in 'configure.ac' to generated an invalid 'mysqld'
	dependency when generating RPMs for RHEL6.
This commit is contained in:
Fred Gleason
2017-05-18 12:55:39 -04:00
parent 2cc1c403c2
commit f530bf7ca8
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -15780,3 +15780,6 @@
2017-05-17 Fred Gleason <fredg@paravelsystems.com> 2017-05-17 Fred Gleason <fredg@paravelsystems.com>
* Added a 'Ticket' field to the test harness page at * Added a 'Ticket' field to the test harness page at
'web/test/listsystemsettings.html'. 'web/test/listsystemsettings.html'.
2017-05-18 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in 'configure.ac' to generated an invalid 'mysqld'
dependency when generating RPMs for RHEL6.

4
configure.ac
View File

@@ -120,7 +120,6 @@ if test $ar_gcc_distro = suse ; then
AC_SUBST(MYSQL_PKG,"mysql") AC_SUBST(MYSQL_PKG,"mysql")
AC_SUBST(QT3_MYSQL_PKG,"qt3-mysql") AC_SUBST(QT3_MYSQL_PKG,"qt3-mysql")
AC_SUBST(QT3_DEVEL_PKG,"qt3-devel") AC_SUBST(QT3_DEVEL_PKG,"qt3-devel")
AC_SUBST(MYSQL_PKG,"mysql")
else else
AC_SUBST(APACHE_PKG,"httpd") AC_SUBST(APACHE_PKG,"httpd")
AC_SUBST(APACHE_CONFIG_DIR,"/etc/httpd/conf.d") AC_SUBST(APACHE_CONFIG_DIR,"/etc/httpd/conf.d")
@@ -130,7 +129,6 @@ else
AC_SUBST(MYSQL_PKG,"mariadb") AC_SUBST(MYSQL_PKG,"mariadb")
AC_SUBST(QT3_MYSQL_PKG,"qt3-MySQL") AC_SUBST(QT3_MYSQL_PKG,"qt3-MySQL")
AC_SUBST(QT3_DEVEL_PKG,"qt3-devel") AC_SUBST(QT3_DEVEL_PKG,"qt3-devel")
AC_SUBST(MYSQL_PKG,"mariadb")
AC_SUBST(CDDA2WAV_PKG,"icedax") AC_SUBST(CDDA2WAV_PKG,"icedax")
else else
if test $ar_distro_major -ge 6 ; then if test $ar_distro_major -ge 6 ; then
@@ -138,14 +136,12 @@ else
AC_SUBST(MYSQL_PKG,"mysql") AC_SUBST(MYSQL_PKG,"mysql")
AC_SUBST(QT3_MYSQL_PKG,"qt-MySQL") AC_SUBST(QT3_MYSQL_PKG,"qt-MySQL")
AC_SUBST(QT3_DEVEL_PKG,"qt3-devel") AC_SUBST(QT3_DEVEL_PKG,"qt3-devel")
AC_SUBST(MYSQL_PKG,"mysqld")
AC_SUBST(CDDA2WAV_PKG,"icedax") AC_SUBST(CDDA2WAV_PKG,"icedax")
else else
AC_SUBST(USERMODE_PKG,"usermode") AC_SUBST(USERMODE_PKG,"usermode")
AC_SUBST(MYSQL_PKG,"mysql") AC_SUBST(MYSQL_PKG,"mysql")
AC_SUBST(QT3_MYSQL_PKG,"qt-MySQL") AC_SUBST(QT3_MYSQL_PKG,"qt-MySQL")
AC_SUBST(QT3_DEVEL_PKG,"qt-devel") AC_SUBST(QT3_DEVEL_PKG,"qt-devel")
AC_SUBST(MYSQL_PKG,"mysqld")
AC_SUBST(CDDA2WAV_PKG,"") AC_SUBST(CDDA2WAV_PKG,"")
fi fi
fi fi