Rebase to 10.4.1

This is BETA release, use with caution!

mariadb.spec

@@ -142,8 +142,8 @@
 %global sameevr   %{epoch}:%{version}-%{release}
 
 Name:             mariadb
-Version:          10.4.0
-Release:          1.alpha%{?with_debug:.debug}%{?dist}
+Version:          10.4.1
+Release:          1.beta%{?with_debug:.debug}%{?dist}
 Epoch:            3
 
 Summary:          A very fast and robust SQL database server
@@ -794,6 +794,7 @@ export CFLAGS CXXFLAGS
          -DINSTALL_SCRIPTDIR=bin \
          -DINSTALL_SQLBENCHDIR=share \
          -DINSTALL_SUPPORTFILESDIR=share/%{pkg_name} \
+         -DINSTALL_PCDIR=%{_lib}/pkgconfig \
          -DMYSQL_DATADIR="%{dbdatadir}" \
          -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
          -DTMPDIR=/var/tmp \
@@ -820,6 +821,7 @@ export CFLAGS CXXFLAGS
          -DPLUGIN_CONNECT=%{?with_connect:DYNAMIC}%{!?with_connect:NO} \
          -DWITH_CASSANDRA=%{?with_cassandra:TRUE}%{!?with_cassandra:FALSE} \
          -DPLUGIN_AWS_KEY_MANAGEMENT=NO \
+         -DPLUGIN_CACHING_SHA2_PASSWORD=%{?with_clibrary:DYNAMIC}%{!?with_clibrary:OFF} \
          -DCONNECT_WITH_MONGO=OFF \
          -DCONNECT_WITH_JDBC=OFF \
 %{?with_debug: -DCMAKE_BUILD_TYPE=Debug -DWITH_ASAN=OFF -DWITH_INNODB_EXTRA_DEBUG=ON -DWITH_VALGRIND=ON}
@@ -862,6 +864,7 @@ fi
 # TODO: check, if it changes location inside that file depending on values passed to Cmake
 mkdir -p %{buildroot}/%{_libdir}/pkgconfig
 mv %{buildroot}/%{_datadir}/pkgconfig/*.pc %{buildroot}/%{_libdir}/pkgconfig
+rm %{buildroot}/usr/lib/pkgconfig/libmariadb.pc
 
 # install INFO_SRC, INFO_BIN into libdir (upstream thinks these are doc files,
 # but that's pretty wacko --- see also %%{name}-file-contents.patch)
@@ -1560,6 +1563,10 @@ fi
 %endif
 
 %changelog
+* Sun Jan 06 2019 Michal Schorm <mschorm@redhat.com> - 3:10.4.1-1
+- Rebase to 10.4.1
+- This is BETA release! use at your own risk.
+
 * Fri Nov 16 2018 Michal Schorm <mschorm@redhat.com> - 3:10.4.0-1
 - Rebase to 10.4.0
 - This is ALPHA release! use at your own risk.

sources

@@ -1 +1 @@
-SHA512 (mariadb-10.4.0.tar.gz) = c81f56e35dd7aac4776dd2b7d18e40adccaff9f4d492e94395b1aeb5c491c712ce4599d0b1374fa585a4d0bba86dd60c91aea7701b6ded0d38409d1caace2671
+SHA512 (mariadb-10.4.1.tar.gz) = 0422bbc4b3a38ff70bfc1cb61f8cb6582c7410a834a15bc593070aa206ca0103c0e4da04a36d02fcb6c21e3646d7920f6de7095b51a27136a7684d9ed54b5f8d