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
=== modified file 'build/percona-server.spec'
--- build/percona-server.spec 2013-02-26 16:40:25 +0000
+++ build/percona-server.spec 2013-03-09 01:30:31 +0000
@@ -1123,12 +1123,13 @@
1123%{_libdir}/mysql/libmysqlservices.a1123%{_libdir}/mysql/libmysqlservices.a
1124%{_libdir}/mysql/libhsclient.a1124%{_libdir}/mysql/libhsclient.a
1125%{_libdir}/libhsclient.la1125%{_libdir}/libhsclient.la
1126%{_libdir}/*.so
11261127
1127# ----------------------------------------------------------------------------1128# ----------------------------------------------------------------------------
1128%files -n Percona-Server-shared%{product_suffix}1129%files -n Percona-Server-shared%{product_suffix}
1129%defattr(-, root, root, 0755)1130%defattr(-, root, root, 0755)
1130# Shared libraries (omit for architectures that don't support them)1131# Shared libraries (omit for architectures that don't support them)
1131%{_libdir}/libmysql*.so*1132%{_libdir}/libmysql*.so.*
1132# Maatkit UDF libs1133# Maatkit UDF libs
1133%{_libdir}/mysql/plugin/libfnv1a_udf.a1134%{_libdir}/mysql/plugin/libfnv1a_udf.a
1134%{_libdir}/mysql/plugin/libfnv1a_udf.la1135%{_libdir}/mysql/plugin/libfnv1a_udf.la
11351136
=== 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:30:31 +0000
@@ -47,7 +47,11 @@
47Version: %{version55}47Version: %{version55}
48Release: %{release}.%{gotrevision}.rhel%{redhatversion}48Release: %{release}.%{gotrevision}.rhel%{redhatversion}
49BuildRoot: %{_tmppath}/%{name}-%{version}-build49BuildRoot: %{_tmppath}/%{name}-%{version}-build
50%if "%{redhatversion}" == "5"
51Obsoletes: MySQL-shared mysql
52%else
50Obsoletes: MySQL-shared mysql-libs53Obsoletes: MySQL-shared mysql-libs
54%endif
51Provides: MySQL-shared mysql-libs55Provides: MySQL-shared mysql-libs
52Summary: MySQL shared client libraries for MySQL %{version}, %{version50}, %{version41} and %{version40}56Summary: MySQL shared client libraries for MySQL %{version}, %{version50}, %{version41} and %{version40}
5357

Subscribers

People subscribed via source and target branches