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

Proposed by Ignacio Nin on 2013-04-23
Status: Work in progress
Proposed branch: lp:~ignacio-nin/percona-server/5.5-bug1171759
Merge into: lp:percona-server/5.5
Diff against target: 20 lines (+10/-0)
1 file modified
build/percona-server.spec (+10/-0)
To merge this branch: bzr merge lp:~ignacio-nin/percona-server/5.5-bug1171759
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2013-04-23 Needs Information on 2013-04-24
Review via email:
To post a comment you must log in.

Is it possible (and does it make sense) to fix libmysqlclient/CMakeLists.txt to create the desired symlinks in the first place?

review: Needs Information

Unmerged revisions

471. By Ignacio Nin on 2013-04-20

Have point to (RPM)

For the RPM shared package, the symlink was
pointing to instead of the versioned Since was moved to the devel
package, when installing the shared package the unversioned library was
not present and the symlink would not get installed.

Fix this by pointing the symlink to the versioned library, which is
included in the shared package as well.

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-23 06:02:56 +0000
+++ build/percona-server.spec 2013-04-23 22:04:29 +0000
@@ -527,6 +527,16 @@
527# FIXME: the shared libraries to use libmysql*-$major.$ syntax527# FIXME: the shared libraries to use libmysql*-$major.$ syntax
528mv -v $RBR/%{_libdir}/*.a $RBR/%{_libdir}/mysql/528mv -v $RBR/%{_libdir}/*.a $RBR/%{_libdir}/mysql/
530# and (generated by
531# libmysql/CMakeLists.txt) point to instead of the versioned
532# Since will live in a separate
533# package, we want these to point to the versioned library.
534for l in "$RBR%{_libdir}/"*
536 rm "$l"
537 ln -s "$(echo "$(basename "$l")" | sed 's/_r//')" "$l"
530# Install logrotate and autostart540# Install logrotate and autostart
531install -m 644 $MBD/release/support-files/mysql-log-rotate $RBR%{_sysconfdir}/logrotate.d/mysql541install -m 644 $MBD/release/support-files/mysql-log-rotate $RBR%{_sysconfdir}/logrotate.d/mysql
532install -m 755 $MBD/release/support-files/mysql.server $RBR%{_sysconfdir}/init.d/mysql542install -m 755 $MBD/release/support-files/mysql.server $RBR%{_sysconfdir}/init.d/mysql


People subscribed via source and target branches