[mariadb/f20] Add new files, related to update to 5.5.39

Honza Horak hhorak at fedoraproject.org
Mon Aug 25 12:45:55 UTC 2014


commit c2c6951a1fc09e6f856d9bfc1fec5a8318978975
Author: Honza Horak <hhorak at redhat.com>
Date:   Mon Aug 25 14:45:46 2014 +0200

    Add new files, related to update to 5.5.39

 mariadb-versioning.patch |    2 +-
 mariadb.spec             |    5 +++++
 2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/mariadb-versioning.patch b/mariadb-versioning.patch
index 034dd48..3065624 100644
--- a/mariadb-versioning.patch
+++ b/mariadb-versioning.patch
@@ -254,7 +254,7 @@ diff -up mariadb-5.5.39/libmysql/CMakeLists.txt.p5 mariadb-5.5.39/libmysql/CMake
 +      ENDIF()
        SET_TARGET_PROPERTIES(libmysql PROPERTIES LINK_FLAGS 
 -        "${libmysql_link_flags} ${LINK_FLAG_NO_UNDEFINED} ${VERSION_SCRIPT_LINK_FLAGS}")
-+        "${libmysql_link_flags} -Wl,--version-script=libmysql.version ${LINK_FLAG_NO_UNDEFINED}")
++        "${libmysql_link_flags} -Wl,libmysql.version ${LINK_FLAG_NO_UNDEFINED}")
      ENDIF() 
      # clean direct output needs to be set several targets have the same name
      #(mysqlclient in this case)
diff --git a/mariadb.spec b/mariadb.spec
index 51a57c4..3189f16 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -630,6 +630,11 @@ fi
 %{_mandir}/man1/mysqlshow.1*
 %{_mandir}/man1/mysqlslap.1*
 %{_mandir}/man1/my_print_defaults.1*
+%{_mandir}/man1/aria_chk.1*
+%{_mandir}/man1/aria_dump_log.1*
+%{_mandir}/man1/aria_ftdump.1*
+%{_mandir}/man1/aria_pack.1*
+%{_mandir}/man1/aria_read_log.1*
 
 %{_libdir}/mysql/mysql_config
 %config(noreplace) %{_sysconfdir}/my.cnf.d/client.cnf


More information about the scm-commits mailing list