Merge lp:~ignacio-nin/percona-server/5.5-bug1167109 into lp:percona-server/5.5

[Ignacio Nin]

Fix for bug #1167109

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'build/percona-server.spec'
--- build/percona-server.spec	2013-04-09 21:37:02 +0000
+++ build/percona-server.spec	2013-04-10 15:08:36 +0000
@@ -257,6 +257,7 @@
 Group:          Applications/Databases
 Requires:       %{distro_requires} Percona-Server-shared%{product_suffix} Percona-Server-client%{product_suffix}
 Provides:       mysql-server MySQL-server
+Conflicts:	Percona-SQL-server-50 Percona-Server-server-51
 
 %description -n Percona-Server-server%{product_suffix}
 The Percona Server software delivers a very fast, multi-threaded, multi-user,
@@ -279,6 +280,7 @@
 Group:          Applications/Databases
 Requires:      Percona-Server-shared%{product_suffix}
 Provides:       mysql-client MySQL-client mysql MySQL
+Conflicts:      Percona-SQL-client-50 Percona-Server-client-51
 
 %description -n Percona-Server-client%{product_suffix}
 This package contains the standard Percona Server client and administration tools.
@@ -291,6 +293,7 @@
 Summary:        Percona Server - Test suite
 Group:          Applications/Databases
 Provides:       mysql-test
+Conflicts:      Percona-SQL-test-50 Percona-Server-test-51
 AutoReqProv:    no
 
 %description -n Percona-Server-test%{product_suffix}
@@ -303,6 +306,7 @@
 Summary:        Percona Server - Development header files and libraries
 Group:          Applications/Databases
 Provides:       mysql-devel
+Conflicts:      Percona-SQL-devel-50 Percona-Server-devel-51
 
 %description -n Percona-Server-devel%{product_suffix}
 This package contains the development header files and libraries necessary