From e11843d212954392bf981857dea10157bdd83e1e Mon Sep 17 00:00:00 2001
From: Honza Horak <hhorak@redhat.com>
Date: Sun, 25 Jan 2015 19:53:08 +0100
Subject: [PATCH] Use correct dir for config files

---
 community-mysql.spec   | 7 +++++--
 my.cnf.in              | 2 +-
 mysql-check-upgrade.sh | 6 +++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/community-mysql.spec b/community-mysql.spec
index 2d16f40..29f4d94 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -74,7 +74,7 @@
 
 Name:             community-mysql
 Version:          5.6.22
-Release:          4%{?with_debug:.debug}%{?dist}
+Release:          5%{?with_debug:.debug}%{?dist}
 Summary:          MySQL client programs and shared libraries
 Group:            Applications/Databases
 URL:              http://www.mysql.com
@@ -468,6 +468,7 @@ cmake .. \
          -DNICE_PROJECT_NAME="MySQL" \
          -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
          -DSYSCONFDIR="%{_sysconfdir}" \
+         -DSYSCONF2DIR="%{_sysconfdir}/my.cnf.d" \
          -DINSTALL_DOCDIR="share/doc/%{_pkgdocdirname}" \
          -DINSTALL_DOCREADMEDIR="share/doc/%{_pkgdocdirname}" \
          -DINSTALL_INCLUDEDIR=include/mysql \
@@ -699,7 +700,6 @@ if [ $1 = 1 ]; then
 fi
 %endif
 /bin/touch %{logfile}
-/bin/chmod 0755 %{dbdatadir}
 
 %preun server
 %if %{with init_systemd}
@@ -942,6 +942,9 @@ fi
 %endif
 
 %changelog
+* Sun Jan 25 2015 Honza Horak <hhorak@redhat.com> - 5.6.22-5
+- Use correct dir for config files
+
 * Sat Jan 24 2015 Honza Horak <hhorak@redhat.com> - 5.6.22-4
 - Move server settings to renamed config file under my.cnf.d dir
 
diff --git a/my.cnf.in b/my.cnf.in
index 247e12d..1e9009e 100644
--- a/my.cnf.in
+++ b/my.cnf.in
@@ -14,5 +14,5 @@ symbolic-links=0
 #
 # include all files from the config directory
 #
-!includedir @INSTALL_SYSCONF2DIR@
+!includedir @SYSCONF2DIR@
 
diff --git a/mysql-check-upgrade.sh b/mysql-check-upgrade.sh
index 43941b8..cf41d84 100644
--- a/mysql-check-upgrade.sh
+++ b/mysql-check-upgrade.sh
@@ -27,9 +27,9 @@ if [ $version -ne $thisversion ] ; then
     cat <<EOF >&2
 The datadir located at $datadir needs to be upgraded using 'mysql_upgrade' tool. This can be done using the following steps:
 
-  1. Back-up your data before running 'mysql_upgrade'
-  2. Start the database daemon using 'systemctl start @DAEMON_NAME@.service'
-  3. Run 'mysql_upgrade' with a database user that has sufficent privileges
+  1. Back-up your data before with 'mysql_upgrade'
+  2. Start the database daemon using 'service @DAEMON_NAME@ start'
+  3. Run 'mysql_upgrade' with a database user that has sufficient privileges
 
 Read more about 'mysql_upgrade' usage at:
 http://dev.mysql.com/doc/refman/5.6/en/mysql-upgrade.html