SHA256
1
0
forked from pool/mariadb
mariadb/mariadb-10.1.12-deharcode-libdir.patch
Adam Majer e4b2876888 Accepting request 563119 from home:kstreitova:branches:server:database
- update to 10.2.12 GA
   * release notes and changelog:
     https://mariadb.com/kb/en/library/mariadb-10212-release-notes/
     https://mariadb.com/kb/en/library/mariadb-10212-changelog/
- remove mysql-community-server-5.5.6-safe-process-in-bin.patch
  becuase this moving is done in the specfile
- get rid of the archive with patches (remove mysql-patches.tar.xz
  and series files), handle patches in the standard way
- add comments to the section with removing unused files (based on
  https://lists.launchpad.net/maria-developers/msg11028.html)
- put rm statements together
- install the new upstream systemd-tmpfiles configuration file
  'tmpfiles.conf' and rename it to 'mariadb.conf' in order to
  follow the manual
- remove the new upstream systemd-sysusers configuration file as
  we handle creating of mysql user in the specfile
- mysql.service: remove calling of the wait function and let
  systemd to do this job. Switch from 'Type=simple' to
  'Type=notify' and add TimeoutSec=300
- rename unit files from mysql to mariadb and add mysql alias for
  the backward compatibility [bsc#1067443]
  * mysql.service -> mariadb.service
  * mysql.target -> mariadb.target
  * mysql@.service -> mariadb@.service
- remove configuration-tweaks.tar.xz and move configuration to
  my.ini/my.cnf file (omit default_plugins.cnf as all
  configuration here was commented out)
- add a numeric prefix for galera.cnf file in order to allow users
  to speficy in which order the configs will be loaded within the
  my.cnf.d directory [bsc#1055268]

OBS-URL: https://build.opensuse.org/request/show/563119
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=203
2018-01-09 18:28:29 +00:00

28 lines
920 B
Diff

PATCH-P0-FIX-SUSE: dehardcode libdir
Don't expect libdir is set to lib64 on x86_64 only.
There is other occurances like ppc64 and aarch64.
Use %{_libdir} macro instead
Maintainer: Dinar Valeev <dvaleev@suse.com>
Index: cmake/install_layout.cmake
===================================================================
--- cmake/install_layout.cmake.orig
+++ cmake/install_layout.cmake
@@ -137,14 +137,6 @@ SET(INSTALL_SCRIPTDIR_RPM
SET(INSTALL_SYSCONFDIR_RPM "/etc")
SET(INSTALL_SYSCONF2DIR_RPM "/etc/my.cnf.d")
#
-IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
- SET(INSTALL_LIBDIR_RPM "lib64")
- SET(INSTALL_PLUGINDIR_RPM "lib64/mysql/plugin")
-ELSE()
- SET(INSTALL_LIBDIR_RPM "lib")
- SET(INSTALL_PLUGINDIR_RPM "lib/mysql/plugin")
-ENDIF()
-#
SET(INSTALL_INCLUDEDIR_RPM "include/mysql")
#
SET(INSTALL_DOCDIR_RPM "share/doc")