rpm/mariadb
SHA256
1
0
Fork 0
forked from pool/mariadb
Code Pull Requests Activity

Accepting request 315366 from home:scarabeus_iv:branches:server:database

Browse Source 
- 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
This commit is contained in:
Martin Pluskal 2015-07-07 10:49:16 +00:00 committed by Git OBS Bridge
parent 559eaee5c0
commit 18bf970597
7 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
_constraints
View File

@ -1,5 +1,8 @@
<constraints> <constraints>
<hardware> <hardware>
<physicalmemory>
<size unit="M">5000</size>
</physicalmemory>
<disk> <disk>
<size unit="G">13</size> <size unit="G">13</size>
</disk> </disk>

4
configuration-tweaks.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:465061d4ebda67a81115efee655eea8fa0d6755677015bfc469d69282707ea89 oid sha256:4daef1c77b163a4b79600d0a441aa84603d62c12515f79c5fd82da2c82e43075
size 307 size 319

5
mariadb.changes
View File

@ -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 Fri Jun 26 07:41:39 UTC 2015 - tchvatal@suse.com

5
mariadb.spec
View File

@ -165,6 +165,9 @@ Requires: libmysqlclient%{soname} = %{version}
Requires: libmysqlclient_r%{soname} = %{version} Requires: libmysqlclient_r%{soname} = %{version}
Requires: openssl-devel Requires: openssl-devel
Requires: zlib-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 %description -n libmysqlclient-devel
This package contains the development header files and libraries 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} mv %{buildroot}%{_datadir}/mysql-test/lib/My/SafeProcess/my_safe_process %{buildroot}%{_bindir}
# Generate various filelists # 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 filelist mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysql_config_editor >mysql-client.files
# The dialog stuff is mariadb only # The dialog stuff is mariadb only

4
mysql-patches.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:a1fa926d7345c0d215687eb46b55d1ba3998e3eaf2db3e4cf55aa0bec88882e5 oid sha256:d5ddecfa457d15482f6bcfa469278e89d164bb86bb1a02519a15218e056d1f40
size 16535 size 16518

2
mysql.service
View File

@ -5,7 +5,7 @@ Conflicts=mysql.target mysql@default.service
After=basic.target network.target syslog.target After=basic.target network.target syslog.target
[Service] [Service]
Restart=on-abnormal Restart=on-failure
Type=simple Type=simple
ExecStartPre=/usr/lib/mysql/mysql-systemd-helper install default ExecStartPre=/usr/lib/mysql/mysql-systemd-helper install default
ExecStartPre=/usr/lib/mysql/mysql-systemd-helper upgrade default ExecStartPre=/usr/lib/mysql/mysql-systemd-helper upgrade default

2
mysql@.service
View File

@ -5,7 +5,7 @@ PartOf=mysql.target
After=basic.target network.target syslog.target After=basic.target network.target syslog.target
[Service] [Service]
Restart=on-abnormal Restart=on-failure
Type=simple Type=simple
ExecStartPre=/usr/lib/mysql/mysql-systemd-helper install %i ExecStartPre=/usr/lib/mysql/mysql-systemd-helper install %i
ExecStartPre=/usr/lib/mysql/mysql-systemd-helper upgrade %i ExecStartPre=/usr/lib/mysql/mysql-systemd-helper upgrade %i