From 5a4ea2b2e41a0819e633edc0e8014de14ed5dc07 Mon Sep 17 00:00:00 2001
From: eulerstorage <eulerstorage@huawei.com>
Date: Wed, 15 Jan 2020 10:24:11 +0800
Subject: [PATCH] keep my.cnf file

---
 mariadb.spec | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/mariadb.spec b/mariadb.spec
index a223857..52846ff 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -2,7 +2,7 @@
 
 Name:             mariadb
 Version:          10.3.9
-Release:          5
+Release:          6
 Epoch:            3
 Summary:          One of the most popular database servers
 License:          GPLv2 with exceptions and LGPLv2 and BSD
@@ -39,6 +39,15 @@ ranging from banking to websites. It is an enhanced, drop-in replacement for MyS
 MariaDB is used because it is fast, scalable and robust, with a rich ecosystem of storage
 engines, plugins and many other tools make it very versatile for a wide variety of use cases.
 
+%package          config
+Summary:          The config files required by server and client
+
+%description      config
+The package provides the config file my.cnf and my.cnf.d directory used by any
+MariaDB or MySQL program. You will need to install this package to use any
+other MariaDB or MySQL package if the config files are not provided in the
+package itself.
+
 %package          common
 Summary:          It including share config files used by client and server
 Requires:         %{_sysconfdir}/my.cnf
@@ -333,6 +342,7 @@ rm -r %{buildroot}%{_datadir}/%{name}/policy/apparmor
 
 chmod -x %{buildroot}%{_datadir}/sql-bench/myisam.cnf
 
+install -D -p -m 0644 support-files/rpm/my.cnf %{buildroot}%{_sysconfdir}/my.cnf
 
 rm %{buildroot}%{_sysconfdir}/my.cnf.d/client.cnf
 rm %{buildroot}%{_libdir}/libmariadb.so.*
@@ -351,7 +361,6 @@ rm -r %{buildroot}%{_includedir}/mysql/{mariadb,mysql}
 
 
 rm %{buildroot}%{_mandir}/man1/tokuft*
-rm %{buildroot}%{_sysconfdir}/my.cnf
 rm -r %{buildroot}%{_datadir}/sql-bench
 
 
@@ -446,7 +455,9 @@ fi
 %{_mandir}/man1/mysql_plugin.1*
 %{_mandir}/man1/mysql_waitpid.1*
 
-
+%files config
+%dir %{_sysconfdir}/my.cnf.d
+%config(noreplace) %{_sysconfdir}/my.cnf
 
 %files common
 %doc %{_defaultdocdir}/%{name}
@@ -596,6 +607,9 @@ fi
 
 
 %changelog
+* Wed Jan 8 2020 openEuler Buildteam <buildteam@openeuler.org> - 3:10.3.9-6
+- Repackaged and keep my.cnf file
+
 * Wed Jan 8 2020 openEuler Buildteam <buildteam@openeuler.org> - 3:10.3.9-5
 - Repackaged
 
-- 
Gitee