[MySQL] Adjusting major soname number of libmysqlclient to avoid library name conflicts with mariadb

[Honza Horak]

commit b8ea85b487057ae8876e7a84bb2fdcb26b07cac5
Author: Honza Horák <hhorak at redhat.com>
Date:   Mon Mar 11 18:37:18 2013 +0100

    Adjusting major soname number of libmysqlclient to avoid library name conflicts with mariadb

 MySQL-major.patch |   12 ++++++++++++
 MySQL.spec        |    8 +++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/MySQL-major.patch b/MySQL-major.patch
new file mode 100644
index 0000000..1b1071e
--- /dev/null
+++ b/MySQL-major.patch
@@ -0,0 +1,12 @@
+diff -up mysql-5.5.30/cmake/mysql_version.cmake.major mysql-5.5.30/cmake/mysql_version.cmake
+--- mysql-5.5.30/cmake/mysql_version.cmake.major	2013-03-11 18:32:45.326473598 +0100
++++ mysql-5.5.30/cmake/mysql_version.cmake	2013-03-11 18:33:10.634472902 +0100
+@@ -17,7 +17,7 @@
+ # Global constants, only to be changed between major releases.
+ #
+ 
+-SET(SHARED_LIB_MAJOR_VERSION "18")
++SET(SHARED_LIB_MAJOR_VERSION "1018")
+ SET(PROTOCOL_VERSION "10")
+ SET(DOT_FRM_VERSION "6")
+ 
diff --git a/MySQL.spec b/MySQL.spec
index 171d88c..2dd8c13 100644
--- a/MySQL.spec
+++ b/MySQL.spec
@@ -1,6 +1,6 @@
 Name: MySQL
 Version: 5.5.30
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
@@ -57,6 +57,7 @@ Patch18: MySQL-cipherspec.patch
 Patch19: MySQL-file-contents.patch
 Patch20: MySQL-string-overflow.patch
 Patch21: MySQL-dh1024.patch
+Patch22: MySQL-major.patch
 
 BuildRequires: perl, readline-devel, openssl-devel
 BuildRequires: cmake, ncurses-devel, zlib-devel, libaio-devel
@@ -219,6 +220,7 @@ the MySQL sources.
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
 
 # workaround for upstream bug #56342
 rm -f mysql-test/t/ssl_8k_key-master.opt
@@ -660,6 +662,10 @@ install -m 0644 mysql-test/rh-skipped-tests.list ${RPM_BUILD_ROOT}%{_datadir}/my
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Mon Mar 11 2013 Honza Horak <hhorak at redhat.com> 5.5.30-3
+- Adjusting major soname number of libmysqlclient to avoid
+  library name conflicts with mariadb
+
 * Mon Mar  4 2013 Honza Horak <hhorak at redhat.com> 5.5.30-2
 - Renaming package mysql to MySQL to handle conflicting issues
   with mariadb, which became default