Merge lp:~ignacio-nin/percona-xtradb-cluster/5.5.29-nonconflicting-libmysqlclient into lp:percona-xtradb-cluster/percona-xtradb-cluster-5.5

[Ignacio Nin]

Changes for solving the RPM shared packages related bugs.

This works together with lp:~ignacio-nin/percona-server/5.0-nonconflicting-libmysqlclient, lp:~ignacio-nin/percona-server/5.1-nonconflicting-libmysqlclient and lp:~ignacio-nin/percona-server/5.5-nonconflicting-libmysqlclient for the products becoming compatible when installing the percona-server-shared package.

[Raghavendra D Prabhu (raghavendra-prabhu)]

I don't think

-SET(WSREP_PATCH_VERSION "7.1")
+SET(WSREP_PATCH_VERSION "7.2")

should be part of this patch since it is bumped upstream. (and it is 7.3 now).

review: Needs Fixing

[Ignacio Nin (ignacio-nin)]

> I don't think
>
> -SET(WSREP_PATCH_VERSION "7.1")
> +SET(WSREP_PATCH_VERSION "7.2")
>
> should be part of this patch since it is bumped upstream. (and it is 7.3 now).

Right now in the target branch Percona-Server/cmake/wsrep.cmake contains 7.1. Also, what's upstream in this context?

[Raghavendra D Prabhu (raghavendra-prabhu)]

In the upstream file it is 7.3, ie.

SET(WSREP_PATCH_VERSION "7.3")

=== modified file 'Percona-Server/cmake/wsrep.cmake'
--- Percona-Server/cmake/wsrep.cmake	2013-02-06 17:19:28 +0000
+++ Percona-Server/cmake/wsrep.cmake	2013-03-09 01:32:24 +0000
@@ -17,7 +17,7 @@
 # so WSREP_VERSION is produced regardless
 
 # Set the patch version
-SET(WSREP_PATCH_VERSION "7.1")
+SET(WSREP_PATCH_VERSION "7.2")
 
 # Obtain patch revision number
 SET(WSREP_PATCH_REVNO $ENV{WSREP_REV})

=== modified file 'build/percona-shared-compat.spec'
--- build/percona-shared-compat.spec	2013-01-22 16:19:45 +0000
+++ build/percona-shared-compat.spec	2013-03-09 01:32:24 +0000
@@ -47,7 +47,11 @@
 Version:      %{version55}
 Release:      %{release}.%{gotrevision}.rhel%{redhatversion}
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
+%if "%{redhatversion}" == "5"
+Obsoletes:    MySQL-shared mysql
+%else
 Obsoletes:    MySQL-shared mysql-libs
+%endif
 Provides:     MySQL-shared mysql-libs
 Summary:      MySQL shared client libraries for MySQL %{version}, %{version50}, %{version41} and %{version40}
 

=== modified file 'build/percona-xtradb-cluster.spec'
--- build/percona-xtradb-cluster.spec	2013-01-25 01:53:12 +0000
+++ build/percona-xtradb-cluster.spec	2013-03-09 01:32:24 +0000
@@ -263,9 +263,9 @@
 %package -n Percona-XtraDB-Cluster-server%{product_suffix}
 Summary:        Percona XtraDB Cluster - server package
 Group:          Applications/Databases
-Requires:       %{distro_requires} mysql-libs Percona-XtraDB-Cluster-galera%{product_suffix} xtrabackup >= 1.9.0 tar nc rsync
+Requires:       %{distro_requires} Percona-XtraDB-Cluster-client%{product_suffix} Percona-XtraDB-Cluster-shared%{product_suffix} Percona-XtraDB-Cluster-galera%{product_suffix} xtrabackup >= 1.9.0 tar nc rsync
 Provides:       mysql-server MySQL-server Percona-Server-server
-Conflicts:	Percona-Server-server-55 Percona-Server-server-51 mysql-server
+Conflicts:	Percona-Server-server-55 Percona-Server-server-51
 
 %description -n Percona-XtraDB-Cluster-server%{product_suffix}
 Percona XtraDB Cluster is based on the Percona Server database server and
@@ -288,9 +288,9 @@
 %package -n Percona-XtraDB-Cluster-client%{product_suffix}
 Summary:        Percona XtraDB Cluster - client package
 Group:          Applications/Databases
-Requires:       mysql-libs
+Requires:       Percona-XtraDB-Cluster-shared%{product_suffix}
 Provides:       mysql-client MySQL-client mysql MySQL Percona-XtraDB-Cluster-client
-Conflicts:	Percona-Server-client-55 Percona-Server-client-51 Percona-SQL-client-50 mysql
+Conflicts:	Percona-Server-client-55 Percona-Server-client-51 Percona-SQL-client-50
 
 %description -n Percona-XtraDB-Cluster-client%{product_suffix}
 Percona XtraDB Cluster is based on the Percona Server database server and
@@ -314,7 +314,7 @@
 Summary:        Percona XtraDB Cluster - Test suite
 Group:          Applications/Databases
 Provides:       mysql-test Percona-Server-test
-Conflicts:	Percona-Server-test-55 Percona-Server-test-51 mysql-test
+Conflicts:	Percona-Server-test-55 Percona-Server-test-51
 AutoReqProv:    no
 
 %description -n Percona-XtraDB-Cluster-test%{product_suffix}
@@ -338,7 +338,7 @@
 Summary:        Percona XtraDB Cluster - Development header files and libraries
 Group:          Applications/Databases
 Provides:       mysql-devel Percona-Server-devel
-Conflicts:	Percona-Server-devel-55 Percona-Server-devel-51 mysql-devel
+Conflicts:	Percona-Server-devel-55 Percona-Server-devel-51
 
 %description -n Percona-XtraDB-Cluster-devel%{product_suffix}
 Percona XtraDB Cluster is based on the Percona Server database server and
@@ -362,7 +362,7 @@
 Summary:        Percona XtraDB Cluster - Shared libraries
 Group:          Applications/Databases
 Provides:       mysql-shared mysql-libs Percona-Server-shared
-Conflicts:	Percona-Server-shared-55 Percona-Server-shared-51 mysql-libs
+Conflicts:	Percona-Server-shared-55
 
 %description -n Percona-XtraDB-Cluster-shared%{product_suffix}
 Percona XtraDB Cluster is based on the Percona Server database server and
@@ -1168,12 +1168,13 @@
 %{_libdir}/mysql/libmysqlservices.a
 %{_libdir}/mysql/libhsclient.a
 %{_libdir}/libhsclient.la
+%{_libdir}/*.so
 
 # ----------------------------------------------------------------------------
 %files -n Percona-XtraDB-Cluster-shared%{product_suffix}
 %defattr(-, root, root, 0755)
 # Shared libraries (omit for architectures that don't support them)
-%{_libdir}/libmysql*.so*
+%{_libdir}/libmysql*.so.*
 # Maatkit UDF libs
 %{_libdir}/mysql/plugin/libfnv1a_udf.a
 %{_libdir}/mysql/plugin/libfnv1a_udf.la