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

Proposed by Ignacio Nin
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: 331
Merged at revision: 338
Proposed branch: lp:~ignacio-nin/percona-server/5.6-bug1167109
Merge into: lp:percona-server/5.6
Prerequisite: lp:~ignacio-nin/percona-server/5.6-bug1165098
Diff against target: 43 lines (+5/-0) (has conflicts)
1 file modified
build/percona-server.spec (+5/-0)
Path conflict: <deleted> / build/debian/docs
Conflict: can't delete build.moved because it is not empty.  Not deleting.
Conflict adding file build.  Moved existing file to build.moved.
Conflict because build.moved is not versioned, but has versioned children.  Versioned directory.
Path conflict: build.moved/build-binary.sh / build/build-binary.sh
Path conflict: build.moved/build-dpkg.sh / build/build-dpkg.sh
Path conflict: build.moved/build-rpm.sh / build/build-rpm.sh
Conflict: can't delete build.moved/debian because it is not empty.  Not deleting.
Conflict because build.moved/debian is not versioned, but has versioned children.  Versioned directory.
To merge this branch: bzr merge lp:~ignacio-nin/percona-server/5.6-bug1167109
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+158144@code.launchpad.net

Description of the change

Fix for bug #1167109, on top of the file-ids fix

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

The patch is OK, the path conflicts are suspicious but should have been resolved at the prerequisite branch, will need checking at the merge time.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'build/percona-server.spec'
2--- build/percona-server.spec 2013-04-10 15:09:42 +0000
3+++ build/percona-server.spec 2013-04-10 15:09:43 +0000
4@@ -258,6 +258,7 @@
5 Group: Applications/Databases
6 Requires: %{distro_requires} Percona-Server-shared%{product_suffix}
7 Provides: mysql-server MySQL-server
8+Conflicts: Percona-SQL-server-50 Percona-Server-server-51 Percona-Server-server-55
9
10 %description -n Percona-Server-server%{product_suffix}
11 The Percona Server software delivers a very fast, multi-threaded, multi-user,
12@@ -280,6 +281,7 @@
13 Group: Applications/Databases
14 Requires: Percona-Server-shared%{product_suffix}
15 Provides: mysql-client MySQL-client mysql MySQL
16+Conflicts: Percona-SQL-client-50 Percona-Server-client-51 Percona-Server-client-55
17
18 %description -n Percona-Server-client%{product_suffix}
19 This package contains the standard Percona Server client and administration tools.
20@@ -292,6 +294,7 @@
21 Summary: Percona Server - Test suite
22 Group: Applications/Databases
23 Provides: mysql-test
24+Conflicts: Percona-SQL-test-50 Percona-Server-test-51 Percona-Server-test-55
25 AutoReqProv: no
26
27 %description -n Percona-Server-test%{product_suffix}
28@@ -304,6 +307,7 @@
29 Summary: Percona Server - Development header files and libraries
30 Group: Applications/Databases
31 Provides: mysql-devel
32+Conflicts: Percona-SQL-devel-50 Percona-Server-devel-51 Percona-Server-devel-55
33
34 %description -n Percona-Server-devel%{product_suffix}
35 This package contains the development header files and libraries necessary
36@@ -316,6 +320,7 @@
37 Summary: Percona Server - Shared libraries
38 Group: Applications/Databases
39 Provides: mysql-shared
40+Conflicts: Percona-Server-shared-55
41
42 %description -n Percona-Server-shared%{product_suffix}
43 This package contains the shared libraries (*.so*) which certain languages

Subscribers

People subscribed via source and target branches