27 lines
1.2 KiB
Diff
27 lines
1.2 KiB
Diff
Upstream chooses to install INFO_SRC and INFO_BIN into the docs dir, which
|
|
breaks at least two packaging commandments, so we put them into $libdir
|
|
instead. That means we have to hack the file_contents regression test
|
|
to know about this.
|
|
|
|
Recommendation they change is at http://bugs.mysql.com/bug.php?id=61425
|
|
|
|
|
|
diff -up mysql-5.6.15/mysql-test/t/file_contents.test.p19 mysql-5.6.15/mysql-test/t/file_contents.test
|
|
--- mysql-5.6.15/mysql-test/t/file_contents.test.p19 2013-12-09 18:44:48.425892516 +0100
|
|
+++ mysql-5.6.15/mysql-test/t/file_contents.test 2013-12-09 18:48:02.247150032 +0100
|
|
@@ -39,6 +39,14 @@ if ($dir_bin =~ m|/usr/|) {
|
|
# If not it might be ULN so try that
|
|
$dir_docs = glob "$dir_bin/share/doc/mysql-community-server*";
|
|
}
|
|
+ # All the above is entirely wacko, because these files are not docs;
|
|
+ # they should be kept in libdir instead. mtr does not provide a nice
|
|
+ # way to find libdir though, so we have to kluge it like this:
|
|
+ if (-d "/usr/lib64/mysql") {
|
|
+ $dir_docs = "/usr/lib64/mysql";
|
|
+ } else {
|
|
+ $dir_docs = "/usr/lib/mysql";
|
|
+ }
|
|
}
|
|
} else {
|
|
# tar.gz package, Windows, or developer work (in BZR)
|