From 18bf970597bdd6a7282b6b09cb3470fabdab23b642a6402ff87d8e5be5962bf8 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 7 Jul 2015 10:49:16 +0000 Subject: [PATCH] Accepting request 315366 from home:scarabeus_iv:branches:server:database - Sync to git state fixing few triv issues OBS-URL: https://build.opensuse.org/request/show/315366 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=177 --- _constraints | 3 +++ configuration-tweaks.tar.bz2 | 4 ++-- mariadb.changes | 5 +++++ mariadb.spec | 5 ++++- mysql-patches.tar.bz2 | 4 ++-- mysql.service | 2 +- mysql@.service | 2 +- 7 files changed, 18 insertions(+), 7 deletions(-) diff --git a/_constraints b/_constraints index 5a60940..4c3ee6f 100644 --- a/_constraints +++ b/_constraints @@ -1,5 +1,8 @@ + + 5000 + 13 diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2 index 2475737..3010ff5 100644 --- a/configuration-tweaks.tar.bz2 +++ b/configuration-tweaks.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:465061d4ebda67a81115efee655eea8fa0d6755677015bfc469d69282707ea89 -size 307 +oid sha256:4daef1c77b163a4b79600d0a441aa84603d62c12515f79c5fd82da2c82e43075 +size 319 diff --git a/mariadb.changes b/mariadb.changes index b33fdd7..4865303 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 7 09:24:09 UTC 2015 - tchvatal@suse.com + +- Sync to git state fixing few triv issues + ------------------------------------------------------------------- Fri Jun 26 07:41:39 UTC 2015 - tchvatal@suse.com diff --git a/mariadb.spec b/mariadb.spec index 313f227..6b6d2ec 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -165,6 +165,9 @@ Requires: libmysqlclient%{soname} = %{version} Requires: libmysqlclient_r%{soname} = %{version} Requires: openssl-devel Requires: zlib-devel +# mysql-devel needs to be provided as some pkgs still depend on it +Provides: mysql-devel = %{version} +Obsoletes: mysql-devel < %{version} %description -n libmysqlclient-devel This package contains the development header files and libraries @@ -452,7 +455,7 @@ rm -f %{buildroot}%{_libdir}/mysql/plugin/daemon_example.ini mv %{buildroot}%{_datadir}/mysql-test/lib/My/SafeProcess/my_safe_process %{buildroot}%{_bindir} # Generate various filelists -filelist innochecksum my_print_defaults myisam_ftdump myisamchk myisamlog myisampack mysql_fix_extensions mysql_fix_privilege_tables mysql_install_db mysql_secure_installation mysql_upgrade mysqlbug mysqld mysqld_multi mysqld_safe mysqlbinlog mysqldumpslow mysqlmanager mroonga resolve_stack_dump resolveip {m,}aria_chk {m,}aria_dump_log {m,}aria_ftdump {m,}aria_pack {m,}aria_read_log xtstat tokuft_logprint tokuftdump >mysql.files +filelist innochecksum my_print_defaults myisam_ftdump myisamchk myisamlog myisampack mysql_fix_extensions mysql_fix_privilege_tables mysql_ssl_rsa_setup mysql_install_db mysql_secure_installation mysql_upgrade mysqlbug mysqld mysqld_multi mysqld_safe mysqlbinlog mysqldumpslow mysqlmanager mroonga resolve_stack_dump resolveip {m,}aria_chk {m,}aria_dump_log {m,}aria_ftdump {m,}aria_pack {m,}aria_read_log xtstat tokuft_logprint tokuftdump >mysql.files filelist mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysql_config_editor >mysql-client.files # The dialog stuff is mariadb only diff --git a/mysql-patches.tar.bz2 b/mysql-patches.tar.bz2 index d74ed37..f99b959 100644 --- a/mysql-patches.tar.bz2 +++ b/mysql-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1fa926d7345c0d215687eb46b55d1ba3998e3eaf2db3e4cf55aa0bec88882e5 -size 16535 +oid sha256:d5ddecfa457d15482f6bcfa469278e89d164bb86bb1a02519a15218e056d1f40 +size 16518 diff --git a/mysql.service b/mysql.service index 13c0159..1d11134 100644 --- a/mysql.service +++ b/mysql.service @@ -5,7 +5,7 @@ Conflicts=mysql.target mysql@default.service After=basic.target network.target syslog.target [Service] -Restart=on-abnormal +Restart=on-failure Type=simple ExecStartPre=/usr/lib/mysql/mysql-systemd-helper install default ExecStartPre=/usr/lib/mysql/mysql-systemd-helper upgrade default diff --git a/mysql@.service b/mysql@.service index 10db609..04d02f7 100644 --- a/mysql@.service +++ b/mysql@.service @@ -5,7 +5,7 @@ PartOf=mysql.target After=basic.target network.target syslog.target [Service] -Restart=on-abnormal +Restart=on-failure Type=simple ExecStartPre=/usr/lib/mysql/mysql-systemd-helper install %i ExecStartPre=/usr/lib/mysql/mysql-systemd-helper upgrade %i