ganapathi / rpms / mariadb

Forked from rpms/mariadb 4 years ago
Clone

Blame SOURCES/mariadb-file-contents.patch

031387
Upstream chooses to install INFO_SRC and INFO_BIN into the docs dir, which
031387
breaks at least two packaging commandments, so we put them into $libdir
031387
instead.  That means we have to hack the file_contents regression test
031387
to know about this.
031387
031387
Recommendation they change is at http://bugs.mysql.com/bug.php?id=61425
031387
031387
031387
diff -up mariadb-5.5.28a/mysql-test/t/file_contents.test.p19 mariadb-5.5.28a/mysql-test/t/file_contents.test
031387
--- mariadb-5.5.28a/mysql-test/t/file_contents.test.p19	2012-11-28 16:49:38.000000000 +0100
031387
+++ mariadb-5.5.28a/mysql-test/t/file_contents.test	2012-12-17 17:44:26.802139136 +0100
031387
@@ -32,6 +32,15 @@ if ($dir_bin eq '/usr/') {
031387
     # RedHat/Debian: version number in directory name
031387
     $dir_docs = glob "$dir_docs/mariadb-server-*";
031387
     $dir_docs = glob "$dir_docs/MySQL-server*" unless -d $dir_docs;
031387
+
031387
+    # All the above is entirely wacko, because these files are not docs;
031387
+    # they should be kept in libdir instead.  mtr does not provide a nice
031387
+    # way to find libdir though, so we have to kluge it like this:
031387
+    if (-d "/usr/lib64/mysql") {
031387
+       $dir_docs = "/usr/lib64/mysql";
031387
+    } else {
031387
+       $dir_docs = "/usr/lib/mysql";
031387
+    }
031387
   }
031387
 } else {
031387
   # tar.gz package, Windows, or developer work (in BZR)