From 73ccd0e2fb1a590005f76250ff3d4ca4cdf9ff64 Mon Sep 17 00:00:00 2001
From: eulerstorage <eulerstorage@huawei.com>
Date: Wed, 8 Jan 2020 09:47:57 +0800
Subject: [PATCH] repackaged

---
 client.cnf               | 13 -------------
 mariadb-connector-c.spec | 17 ++++++++---------
 my.cnf                   | 11 -----------
 3 files changed, 8 insertions(+), 33 deletions(-)
 delete mode 100644 client.cnf
 delete mode 100644 my.cnf

diff --git a/client.cnf b/client.cnf
deleted file mode 100644
index 9028505..0000000
--- a/client.cnf
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# 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/mariadb-connector-c.spec b/mariadb-connector-c.spec
index 9bb2073..9aa3850 100644
--- a/mariadb-connector-c.spec
+++ b/mariadb-connector-c.spec
@@ -1,13 +1,10 @@
 Name:           mariadb-connector-c
 Version:        3.0.6
-Release:        4
+Release:        5
 Summary:        MariaDB connector library in C
 License:        LGPLv2+
 URL:            https://github.com/MariaDB/mariadb-connector-c
-Source:         https://downloads.mariadb.org/interstitial/connector-c-%{version}/mariadb-connector-c-%{version}-src.tar.gz
-#Source2-3 come from fedora29
-Source2:        my.cnf
-Source3:        client.cnf
+Source0:        https://downloads.mariadb.com/Connectors/c/connector-c-%{version}/mariadb-connector-c-%{version}-src.tar.gz
 
 BuildRequires:  libcurl-devel zlib-devel openssl-devel
 BuildRequires:  cmake git
@@ -59,8 +56,6 @@ ln -s mariadb_config %{buildroot}%{_bindir}/mysql_config
 ln -s mariadb_version.h %{buildroot}%{_includedir}/mysql/mysql_version.h
 mkdir -p %{buildroot}%{_sysconfdir}/
 mkdir -p %{buildroot}%{_sysconfdir}/my.cnf.d
-install -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/my.cnf
-install -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/my.cnf.d/client.cnf
 
 %check
 %{buildroot}%{_bindir}/mariadb_config
@@ -84,8 +79,6 @@ end
 %doc README
 %license COPYING.LIB
 %dir %{_sysconfdir}/my.cnf.d
-%config(noreplace) %{_sysconfdir}/my.cnf
-%config(noreplace) %{_sysconfdir}/my.cnf.d/client.cnf
 %dir %{_libdir}/mariadb
 %{_libdir}/libmariadb.so.*
 %dir %{_libdir}/mariadb/plugin
@@ -100,6 +93,12 @@ end
 %{_libdir}/*.so
 
 %changelog
+* Wed Jan 8 2020 openEuler Buildteam <buildteam@openeuler.org> - 3.0.6-5
+- Type:enhance
+- ID:NA
+- SUG:restart
+- DESC:repackaged
+
 * Sun Dec 29 2019 openEuler Buildteam <buildteam@openeuler.org> - 3.0.6-4
 - Type:bugfix
 - ID:NA
diff --git a/my.cnf b/my.cnf
deleted file mode 100644
index 913b88f..0000000
--- a/my.cnf
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# 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
-