forked from pool/mariadb
Adam Majer
e4b2876888
- 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
34 lines
1.4 KiB
Diff
34 lines
1.4 KiB
Diff
PATCH-P1-FIX-HACK: Allow more case-insensitive values for 'WITH_SYSTEMD'
|
|
|
|
Remove 'IF(WITH_SYSTEMD STREQUAL "yes")' and use 'IF(WITH_SYSTEMD)'
|
|
expression in order to allow more case-insensitive values to be used
|
|
here (1, ON, YES, TRUE or Y).
|
|
|
|
Maintainer: Kristyna Streitova <kstreitova@suse.cz>
|
|
|
|
Index: mariadb-10.2.9/cmake/systemd.cmake
|
|
===================================================================
|
|
--- mariadb-10.2.9.orig/cmake/systemd.cmake
|
|
+++ mariadb-10.2.9/cmake/systemd.cmake
|
|
@@ -18,9 +18,9 @@ MACRO(CHECK_SYSTEMD)
|
|
INCLUDE(FindPkgConfig)
|
|
# http://www.cmake.org/cmake/help/v3.0/module/FindPkgConfig.html
|
|
SET(WITH_SYSTEMD "auto" CACHE STRING "Enable systemd scripts and notification support")
|
|
- IF(WITH_SYSTEMD STREQUAL "yes" OR WITH_SYSTEMD STREQUAL "auto")
|
|
+ IF(WITH_SYSTEMD OR WITH_SYSTEMD STREQUAL "auto")
|
|
IF(PKG_CONFIG_FOUND)
|
|
- IF(WITH_SYSTEMD STREQUAL "yes")
|
|
+ IF(WITH_SYSTEMD)
|
|
pkg_search_module(LIBSYSTEMD REQUIRED libsystemd libsystemd-daemon)
|
|
ELSE()
|
|
pkg_search_module(LIBSYSTEMD libsystemd libsystemd-daemon)
|
|
@@ -68,7 +68,7 @@ MACRO(CHECK_SYSTEMD)
|
|
UNSET(HAVE_SYSTEMD_SD_NOTIFY)
|
|
UNSET(HAVE_SYSTEMD_SD_NOTIFYF)
|
|
MESSAGE_ONCE(systemd "Systemd features not enabled")
|
|
- IF(WITH_SYSTEMD STREQUAL "yes")
|
|
+ IF(WITH_SYSTEMD )
|
|
MESSAGE(FATAL_ERROR "Requested WITH_SYSTEMD=yes however no dependencies installed/found")
|
|
ENDIF()
|
|
ENDIF()
|