summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorBalasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>2014-08-06 09:56:37 +0200
committerBalasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>2014-08-06 09:56:37 +0200
commitb9bc2bd434a402c15fc0e833a3da6e558524eb8e (patch)
tree4ccf300c617145e4e920f092630ccfdb053ce401 /support-files
parentd345978d27a512a6adf5307cf60f7b0353fcad35 (diff)
parent1a1e9040044c63580ffc9ac5a9cae7c495d92df4 (diff)
downloadmariadb-git-b9bc2bd434a402c15fc0e833a3da6e558524eb8e.tar.gz
- Merge from mysql-5.5.39-ol7-release branch
- Reverted version variable
Diffstat (limited to 'support-files')
-rw-r--r--support-files/mysql.spec.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 082d1fcfef1..9469a8d8769 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -142,9 +142,9 @@
%else
%if %(test -f /etc/oracle-release && echo 1 || echo 0)
%define elver %(rpm -qf --qf '%%{version}\\n' /etc/oracle-release | sed -e 's/^\\([0-9]*\\).*/\\1/g')
- %if "%elver" == "6"
- %define distro_description Oracle Linux 6
- %define distro_releasetag el6
+ %if "%elver" == "6" || "%elver" == "7"
+ %define distro_description Oracle Linux %elver
+ %define distro_releasetag el%elver
%define distro_buildreq gcc-c++ ncurses-devel perl readline-devel time zlib-devel cmake libaio-devel
%define distro_requires chkconfig coreutils grep procps shadow-utils net-tools
%else