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

Proposed by Ignacio Nin
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 503
Proposed branch: lp:~ignacio-nin/percona-server/5.5-bug1167109
Merge into: lp:percona-server/5.5
Diff against target: 35 lines (+4/-0)
1 file modified
build/percona-server.spec (+4/-0)
To merge this branch: bzr merge lp:~ignacio-nin/percona-server/5.5-bug1167109
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+158143@code.launchpad.net

Description of the change

Fix for bug #1167109

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
257Group: Applications/Databases257Group: Applications/Databases
258Requires: %{distro_requires} Percona-Server-shared%{product_suffix} Percona-Server-client%{product_suffix}258Requires: %{distro_requires} Percona-Server-shared%{product_suffix} Percona-Server-client%{product_suffix}
259Provides: mysql-server MySQL-server259Provides: mysql-server MySQL-server
260Conflicts: Percona-SQL-server-50 Percona-Server-server-51
260261
261%description -n Percona-Server-server%{product_suffix}262%description -n Percona-Server-server%{product_suffix}
262The Percona Server software delivers a very fast, multi-threaded, multi-user,263The Percona Server software delivers a very fast, multi-threaded, multi-user,
@@ -279,6 +280,7 @@
279Group: Applications/Databases280Group: Applications/Databases
280Requires: Percona-Server-shared%{product_suffix}281Requires: Percona-Server-shared%{product_suffix}
281Provides: mysql-client MySQL-client mysql MySQL282Provides: mysql-client MySQL-client mysql MySQL
283Conflicts: Percona-SQL-client-50 Percona-Server-client-51
282284
283%description -n Percona-Server-client%{product_suffix}285%description -n Percona-Server-client%{product_suffix}
284This package contains the standard Percona Server client and administration tools.286This package contains the standard Percona Server client and administration tools.
@@ -291,6 +293,7 @@
291Summary: Percona Server - Test suite293Summary: Percona Server - Test suite
292Group: Applications/Databases294Group: Applications/Databases
293Provides: mysql-test295Provides: mysql-test
296Conflicts: Percona-SQL-test-50 Percona-Server-test-51
294AutoReqProv: no297AutoReqProv: no
295298
296%description -n Percona-Server-test%{product_suffix}299%description -n Percona-Server-test%{product_suffix}
@@ -303,6 +306,7 @@
303Summary: Percona Server - Development header files and libraries306Summary: Percona Server - Development header files and libraries
304Group: Applications/Databases307Group: Applications/Databases
305Provides: mysql-devel308Provides: mysql-devel
309Conflicts: Percona-SQL-devel-50 Percona-Server-devel-51
306310
307%description -n Percona-Server-devel%{product_suffix}311%description -n Percona-Server-devel%{product_suffix}
308This package contains the development header files and libraries necessary312This package contains the development header files and libraries necessary

Subscribers

People subscribed via source and target branches