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

Proposed by Ignacio Nin
Status: Merged
Approved by: Alexey Bychko
Approved revision: 402
Merged at revision: 470
Proposed branch: lp:~ignacio-nin/percona-server/5.5-nonconflicting-libmysqlclient
Merge into: lp:percona-server/5.5
Diff against target: 33 lines (+6/-1)
2 files modified
build/percona-server.spec (+2/-1)
build/percona-shared-compat.spec (+4/-0)
To merge this branch: bzr merge lp:~ignacio-nin/percona-server/5.5-nonconflicting-libmysqlclient
Reviewer Review Type Date Requested Status
Percona core Pending
Review via email: mp+152544@code.launchpad.net

Description of the change

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-xtradb-cluster/5.5.29-nonconflicting-libmysqlclient for the products becoming compatible when installing the percona-server-shared package.

To post a comment you must log in.

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-02-26 16:40:25 +0000
3+++ build/percona-server.spec 2013-03-09 01:30:31 +0000
4@@ -1123,12 +1123,13 @@
5 %{_libdir}/mysql/libmysqlservices.a
6 %{_libdir}/mysql/libhsclient.a
7 %{_libdir}/libhsclient.la
8+%{_libdir}/*.so
9
10 # ----------------------------------------------------------------------------
11 %files -n Percona-Server-shared%{product_suffix}
12 %defattr(-, root, root, 0755)
13 # Shared libraries (omit for architectures that don't support them)
14-%{_libdir}/libmysql*.so*
15+%{_libdir}/libmysql*.so.*
16 # Maatkit UDF libs
17 %{_libdir}/mysql/plugin/libfnv1a_udf.a
18 %{_libdir}/mysql/plugin/libfnv1a_udf.la
19
20=== modified file 'build/percona-shared-compat.spec'
21--- build/percona-shared-compat.spec 2013-01-22 16:19:45 +0000
22+++ build/percona-shared-compat.spec 2013-03-09 01:30:31 +0000
23@@ -47,7 +47,11 @@
24 Version: %{version55}
25 Release: %{release}.%{gotrevision}.rhel%{redhatversion}
26 BuildRoot: %{_tmppath}/%{name}-%{version}-build
27+%if "%{redhatversion}" == "5"
28+Obsoletes: MySQL-shared mysql
29+%else
30 Obsoletes: MySQL-shared mysql-libs
31+%endif
32 Provides: MySQL-shared mysql-libs
33 Summary: MySQL shared client libraries for MySQL %{version}, %{version50}, %{version41} and %{version40}
34

Subscribers

People subscribed via source and target branches