[RackTables/epel7: 1/2] Fix mysql dependencies to mariadb for RHEL7 and Fedora21

Colin Coe coec at fedoraproject.org
Mon Mar 2 00:58:28 UTC 2015


commit a4d87bb3fbea06080460640237d84000f6fdc006
Author: Colin Coe <colin.coe at gmail.com>
Date:   Mon Mar 2 08:56:05 2015 +0800

    Fix mysql dependencies to mariadb for RHEL7 and Fedora21

 RackTables.spec | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/RackTables.spec b/RackTables.spec
index af858a3..5410e9c 100644
--- a/RackTables.spec
+++ b/RackTables.spec
@@ -1,6 +1,6 @@
 Name:           RackTables
 Version:        0.20.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A data-center asset management system
 
 Group:          Applications/Internet
@@ -12,7 +12,19 @@ Source1:        README.Fedora
 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 mysql-server /bin/sh
+Requires:       httpd php php-mysql php-pdo php-gd php-snmp php-mbstring php-bcmath /bin/sh
+%if 0%{?rhel} <= 6
+Requires: mysql-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
+%endif
 BuildArch:      noarch
 
 %description
@@ -50,6 +62,9 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/secret.php
 %ghost %config(noreplace) %{_sysconfdir}/%{name}/secret.php
 
 %changelog
+* Mon Mar 2 2015 Colin Coe <colin.coe at gmail.com> - 0.20.10-2
+- Fix mysql dependencies to mariadb for RHEL7 and Fedora21
+
 * Thu Feb 5 2015 Colin Coe <colin.coe at gmail.com> - 0.20.10-1
 - Rebase to v0.20.10
 


More information about the scm-commits mailing list