summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorBalasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>2014-08-20 09:46:38 +0200
committerBalasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>2014-08-20 09:46:38 +0200
commit010ea6ccc61134a2ced75acd6d3e9e2b596c18f3 (patch)
treef35eee8c8face5c39f38b179aa44f048c6c0cbd0 /support-files
parent471569e07209c4d2122022bc38a19538d1462dbd (diff)
parent9e111f6a2a590faa67cceb075f24e806b5b66f14 (diff)
downloadmariadb-git-010ea6ccc61134a2ced75acd6d3e9e2b596c18f3.tar.gz
Add my.cnf.d to regular rpm for EL7 build
Diffstat (limited to 'support-files')
-rw-r--r--support-files/mysql.spec.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 9469a8d8769..ee95e65780b 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -251,6 +251,7 @@ URL: http://www.mysql.com/
Packager: MySQL Release Engineering <mysql-build@oss.oracle.com>
Vendor: %{mysql_vendor}
BuildRequires: %{distro_buildreq}
+%{?el7:Patch0: mysql-5.5-libmysqlclient-symbols.patch}
# Regression tests may take a long time, override the default to skip them
%{!?runselftest:%global runselftest 1}
@@ -443,7 +444,8 @@ For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
##############################################################################
%prep
%setup -T -a 0 -c -n %{src_dir}
-
+pushd %{src_dir}
+%{?el7:%patch0 -p1}
##############################################################################
%build
@@ -559,6 +561,8 @@ install -d $RBR%{_libdir}
install -d $RBR%{_mandir}
install -d $RBR%{_sbindir}
+mkdir -p $RBR%{_sysconfdir}/my.cnf.d
+
# Install all binaries
(
cd $MBD/release
@@ -1094,6 +1098,7 @@ echo "=====" >> $STATUS_HISTORY
%doc %attr(644, root, man) %{_mandir}/man1/resolveip.1*
%ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf
+%dir %{_sysconfdir}/my.cnf.d
%attr(755, root, root) %{_bindir}/innochecksum
%attr(755, root, root) %{_bindir}/my_print_defaults