mysql/community-mysql-file-contents.patch

46 lines
1.6 KiB
Diff
Raw Normal View History

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
2014-12-03 14:01:06 +00:00
diff -up mysql-5.6.22/mysql-test/t/file_contents.test.file-contents mysql-5.6.22/mysql-test/t/file_contents.test
--- mysql-5.6.22/mysql-test/t/file_contents.test.file-contents 2014-12-03 15:05:18.629731527 +0100
+++ mysql-5.6.22/mysql-test/t/file_contents.test 2014-12-03 15:09:36.082081039 +0100
@@ -11,7 +11,7 @@
--perl
print "\nChecking 'INFO_SRC' and 'INFO_BIN'\n";
$dir_bin = $ENV{'MYSQL_BINDIR'};
-if ($dir_bin =~ m|/usr/|) {
+if ($dir_bin =~ m|.*/usr/$|) {
# RPM package
$dir_docs = $dir_bin;
$dir_docs =~ s|/lib|/share/doc|;
2014-12-03 14:01:06 +00:00
@@ -30,7 +30,7 @@ if ($dir_bin =~ m|/usr/|) {
}
}
}
-} elsif ($dir_bin =~ m|/usr$|) {
+} elsif ($dir_bin =~ m|.*/usr$|) {
# RPM build during development
$dir_docs = "$dir_bin/share/doc";
if(-d "$dir_docs/packages") {
2014-12-03 14:01:06 +00:00
@@ -47,6 +47,15 @@ if ($dir_bin =~ m|/usr/|) {
$dir_docs = glob "$dir_bin/share/mysql/docs";
}
2013-12-10 12:28:18 +00:00
}
+
2013-03-22 14:09:46 +00:00
+ # 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 "$dir_bin/lib64/mysql") {
+ $dir_docs = "$dir_bin/lib64/mysql";
2013-03-22 14:09:46 +00:00
+ } else {
+ $dir_docs = "$dir_bin/lib/mysql";
2013-03-22 14:09:46 +00:00
+ }
}
} else {
# tar.gz package, Windows, or developer work (in BZR)