[RackTables: 3/3] Really fix mysql-server dependency

[Colin Coe]

commit a009d62f8c594d08fcbcaccec18b15763343674f
Author: Colin Coe <colin.coe at gmail.com>
Date:   Wed Mar 4 20:33:43 2015 +0800

    Really fix mysql-server dependency

 RackTables.spec | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/RackTables.spec b/RackTables.spec
index a6e6cae..2562dcd 100644
--- a/RackTables.spec
+++ b/RackTables.spec
@@ -1,6 +1,6 @@
 Name:           RackTables
 Version:        0.20.10
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A data-center asset management system
 
 Group:          Applications/Internet
@@ -13,17 +13,13 @@ Source2:        quickinstall.sh
 Patch1:         %{name}-Fedora-paths.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       httpd php php-mysql php-pdo php-gd php-snmp php-mbstring php-bcmath /bin/sh
-%if 0%{?rhel} <= 6
-Requires: mysql-server
+%if 0%{?rhel}
+%{?el6:Requires: mysql-server}
+%{?el7:Requires: mariadb-server}
 %endif
-%if 0%{?fedora} <= 20
-Requires: mysql-server
-%endif
-%if 0%{?rhel} >= 7
-Requires: mariadb-server
-%endif
-%if 0%{?fedora} >= 21
-Requires: mariadb-server
+%if 0%{?fedora}
+%{?fc20:Requires: mysql-server}
+%{?fc21:Requires: mariadb-server}
 %endif
 BuildArch:      noarch
 
@@ -62,6 +58,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/secret.php
 %ghost %config(noreplace) %{_sysconfdir}/%{name}/secret.php
 
 %changelog
+* Thu Mar 4 2015 Colin Coe <colin.coe at gmail.com> - 0.20.10-4
+- Really fix mysql dependencies to mariadb for RHEL7 and Fedora21
+
 * Thu Mar 4 2015 Colin Coe <colin.coe at gmail.com> - 0.20.10-3
 - Bump to re-push