rpms/mariadb
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Use updated sources from upstream GitHub, instead of the released version 10.4.10

Browse Source 
for fix for https://jira.mariadb.org/browse/MDEV-21229

Upstream commit that fixes the issue:
9a62120089
This commit is contained in:
Michal Schorm 2019-12-06 15:06:31 +01:00
parent 8d089185e5
commit c487d09e4d
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mariadb.spec
View File

@ -158,7 +158,7 @@
Name: mariadb Name: mariadb
Version: 10.4.10 Version: 10.4.10
Release: 1%{?with_debug:.debug}%{?dist} Release: 1.20191205git9a621200%{?with_debug:.debug}%{?dist}
Epoch: 3 Epoch: 3
Summary: A very fast and robust SQL database server Summary: A very fast and robust SQL database server
@ -266,7 +266,7 @@ Requires: bash coreutils grep
Requires: %{name}-common%{?_isa} = %{sameevr} Requires: %{name}-common%{?_isa} = %{sameevr}
%if %{with clibrary} || %{with galera} %if %{with clibrary}
# Explicit EVR requirement for -libs is needed for RHBZ#1406320 # Explicit EVR requirement for -libs is needed for RHBZ#1406320
Requires: %{name}-libs%{?_isa} = %{sameevr} Requires: %{name}-libs%{?_isa} = %{sameevr}
%else %else
@ -304,7 +304,7 @@ The base package contains the standard MariaDB/MySQL client programs and
generic MySQL files. generic MySQL files.
%if %{with clibrary} || %{with galera} %if %{with clibrary}
%package libs %package libs
Summary: The shared libraries required for MariaDB/MySQL clients Summary: The shared libraries required for MariaDB/MySQL clients
Requires: %{name}-common%{?_isa} = %{sameevr} Requires: %{name}-common%{?_isa} = %{sameevr}
@ -350,7 +350,7 @@ Requires: %{_sysconfdir}/my.cnf
# obsoletion of mariadb-galera-common # obsoletion of mariadb-galera-common
Provides: mariadb-galera-common = %{sameevr} Provides: mariadb-galera-common = %{sameevr}
%if %{without clibrary} && %{without galera} %if %{without clibrary}
Obsoletes: %{name}-libs <= %{sameevr} Obsoletes: %{name}-libs <= %{sameevr}
%endif %endif
@ -377,7 +377,7 @@ MariaDB packages.
Summary: The configuration files and scripts for galera replication Summary: The configuration files and scripts for galera replication
Requires: %{name}-common%{?_isa} = %{sameevr} Requires: %{name}-common%{?_isa} = %{sameevr}
Requires: %{name}-server%{?_isa} = %{sameevr} Requires: %{name}-server%{?_isa} = %{sameevr}
Requires: galera >= 25.3.3 Requires: galera >= 26.4.3
Requires(post): libselinux-utils Requires(post): libselinux-utils
Requires(post): policycoreutils-python-utils Requires(post): policycoreutils-python-utils
# wsrep requirements # wsrep requirements
@ -595,7 +595,7 @@ the only MariaDB sub-package, except test subpackage, that depends on Perl.
%package devel %package devel
Summary: Files for development of MariaDB/MySQL applications Summary: Files for development of MariaDB/MySQL applications
Requires: openssl-devel Requires: openssl-devel
%if %{with clibrary} || %{with galera} %if %{with clibrary}
Requires: %{name}-libs%{?_isa} = %{sameevr} Requires: %{name}-libs%{?_isa} = %{sameevr}
%else %else
Requires: mariadb-connector-c-devel >= 3.0 Requires: mariadb-connector-c-devel >= 3.0
@ -921,7 +921,6 @@ rm %{buildroot}%{_libdir}/pkgconfig/libmariadb.pc
# but that's pretty wacko --- see also %%{name}-file-contents.patch) # but that's pretty wacko --- see also %%{name}-file-contents.patch)
install -p -m 644 Docs/INFO_SRC %{buildroot}%{_libdir}/%{pkg_name}/ install -p -m 644 Docs/INFO_SRC %{buildroot}%{_libdir}/%{pkg_name}/
install -p -m 644 Docs/INFO_BIN %{buildroot}%{_libdir}/%{pkg_name}/ install -p -m 644 Docs/INFO_BIN %{buildroot}%{_libdir}/%{pkg_name}/
rm -r %{buildroot}%{_datadir}/doc/%{_pkgdocdirname}/MariaDB-server-%{version}/
# Logfile creation # Logfile creation
mkdir -p %{buildroot}%{logfiledir} mkdir -p %{buildroot}%{logfiledir}

8
rh-skipped-tests-base.list
View File

@ -50,4 +50,10 @@ innodb_gis.rtree_compress2 :
parts.partition_alter4_innodb : parts.partition_alter4_innodb :
# Fails from 10.3.9 # Fails from 10.3.9
encryption.innodb-redo-badkey : encryption.innodb-redo-badkey :
# Expected: Plugin building disabled in server
plugins.auth_ed25519 :
# Fails from 10.4.10
sys_vars.tcp_nodelay :

2
sources
View File

@ -1 +1 @@
SHA512 (mariadb-10.4.7.tar.gz) = cb8b5adaef1970b9c8f04db08c18660f8b3df87f699aa93c1bee9497b887ddf50fcf3a2aebbe21a5fc9dfcbd118d0192d7421512522d98eaf30a014822c2f7ce SHA512 (mariadb-10.4.10.tar.gz) = a8b93be9dba6f9d2fd5a8da53f37c1f1c0469c64c919c2978e5f31871a6eb4052da96d162269c2d060d258c14ca92c357caa7a63da4f6f87443e5625412ab18f