Merge from 5.5. => 5.6 Add my.cnf.d directory for EL7 regular rpm build

awesomeleo · Aug 20, 2014 · 5a788dc · 5a788dc
2 parents d5f9aa8 + 010ea6c
commit 5a788dc
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
@@ -442,7 +442,6 @@ For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
 ##############################################################################
 %prep
 %setup -T -a 0 -c -n %{src_dir}
-
 ##############################################################################
 %build
 
@@ -562,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
@@ -1088,6 +1089,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