create a new MariaDB-common.rpm that contains files needed both by the client and the server.

use my.cnf includes to split one big my.cnf file in server and client parts.

remove "Provides: mysql-libs" (doesn't help on CentOS 6)

9 files changed, 82 insertions, 0 deletions

diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt
index 177980414ca..fde4746df16 100644
--- a/support-files/CMakeLists.txt
+++ b/support-files/CMakeLists.txt
@@ -102,6 +102,16 @@ IF(UNIX)
             RENAME mysql COMPONENT SupportFiles
             PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
             GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+
+    INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR}
+            COMPONENT Common)
+    INSTALL(FILES rpm/client.cnf DESTINATION ${INSTALL_SYSCONFDIR}/my.cnf.d
+            COMPONENT SharedLibraries)
+    INSTALL(FILES rpm/mysql-clients.cnf DESTINATION ${INSTALL_SYSCONFDIR}/my.cnf.d
+            COMPONENT Client)
+    INSTALL(FILES rpm/server.cnf DESTINATION ${INSTALL_SYSCONFDIR}/my.cnf.d
+            COMPONENT IniFiles)
+
     # This is for SuSE:
     INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
                    ${INSTALL_SYSCONFDIR}/init.d/mysql
diff --git a/support-files/rpm/client.cnf b/support-files/rpm/client.cnf
new file mode 100644
index 00000000000..9028505a98a
--- /dev/null
+++ b/support-files/rpm/client.cnf
@@ -0,0 +1,13 @@
+#
+# These two groups are read by the client library
+# Use it for options that affect all clients, but not the server
+#
+
+
+[client]
+
+# This group is not read by mysql client library,
+# If you use the same .cnf file for MySQL and MariaDB,
+# use it for MariaDB-only client options
+[client-mariadb]
+
diff --git a/support-files/rpm/my.cnf b/support-files/rpm/my.cnf
new file mode 100644
index 00000000000..913b88f8328
--- /dev/null
+++ b/support-files/rpm/my.cnf
@@ -0,0 +1,11 @@
+#
+# This group is read both both by the client and the server
+# use it for options that affect everything
+#
+[client-server]
+
+#
+# include all files from the config directory
+#
+!includedir /etc/my.cnf.d
+
diff --git a/support-files/rpm/mysql-clients.cnf b/support-files/rpm/mysql-clients.cnf
new file mode 100644
index 00000000000..3df9b7b955f
--- /dev/null
+++ b/support-files/rpm/mysql-clients.cnf
@@ -0,0 +1,23 @@
+#
+# These groups are read by MariaDB command-line tools
+# Use it for options that affect only one utility
+#
+
+[mysql]
+
+[mysql_upgrade]
+
+[mysqladmin]
+
+[mysqlbinlog]
+
+[mysqlcheck]
+
+[mysqldump]
+
+[mysqlimport]
+
+[mysqlshow]
+
+[mysqlslap]
+
diff --git a/support-files/rpm-postin.sh b/support-files/rpm/server-postin.sh
index 49a8253ceef..49a8253ceef 100644
--- a/support-files/rpm-postin.sh
+++ b/support-files/rpm/server-postin.sh
diff --git a/support-files/rpm-prein.sh b/support-files/rpm/server-prein.sh
index 0a8ac0c5f97..0a8ac0c5f97 100644
--- a/support-files/rpm-prein.sh
+++ b/support-files/rpm/server-prein.sh
diff --git a/support-files/rpm-preun.sh b/support-files/rpm/server-preun.sh
index 182be27f1ec..182be27f1ec 100644
--- a/support-files/rpm-preun.sh
+++ b/support-files/rpm/server-preun.sh
diff --git a/support-files/rpm/server.cnf b/support-files/rpm/server.cnf
new file mode 100644
index 00000000000..8cf2c74dbe4
--- /dev/null
+++ b/support-files/rpm/server.cnf
@@ -0,0 +1,25 @@
+#
+# These groups are read by MariaDB server
+# Use it for options that only the server (but not clients) should see
+#
+# See the examples of server my.cnf files in /usr/share/mysql/
+#
+
+[mysqld]
+
+[server]
+
+[embedded]
+
+# This group is only read by MariaDB-5.5 servers.
+# If you use the same .cnf file for MariaDB of different versions,
+# use this group for options that older servers don't understand
+[mysqld-5.5]
+
+# These two groups are only read by MariaDB servers, not by MySQL.
+# If you use the same .cnf file for MySQL and MariaDB,
+# you can put MariaDB-only options here
+[mariadb]
+
+[mariadb-5.5]
+
diff --git a/support-files/rpm-ldconfig.sh b/support-files/rpm/shared-post.sh
index 8b0c822426a..8b0c822426a 100644
--- a/support-files/rpm-ldconfig.sh
+++ b/support-files/rpm/shared-post.sh