updated 2 packages

galera-26.4.9-1

mariadb-10.6.4-1

g/galera/galera-vl.spec

@@ -2,7 +2,7 @@
 %bcond_with		python3
 %bcond_without	cmake
 
-%define mariadb_version 10.5.10
+%define mariadb_version 10.6.4
 
 %if %{with python3}
 %global scons scons-3
@@ -12,7 +12,7 @@
 
 Summary:        Synchronous multi-master wsrep provider (replication engine)
 Name:           galera
-Version:        26.4.8
+Version:        26.4.9
 Release:        1%{?_dist_release}%{?with_systemd:.systemd}
 %global         galera_api_version %(echo %{version} | cut -d . -f 1,2)
 Group:          servers
@@ -192,6 +192,9 @@ fi
 
 
 %changelog
+* Sat Aug 07 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 26.4.9-1
+- new upstream release.
+
 * Sat May 08 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 26.4.8-1
 - new upstream release.
 - dropped ldconfig scriptlets.

m/mariadb/mariadb-vl.spec

@@ -1,7 +1,6 @@
 %bcond_with systemd
 %bcond_with source
 %bcond_without onigmo
-%bcond_with tokudb
 
 %global daemon_name mariadb
 
@@ -15,10 +14,10 @@
 
 %define _unpackaged_files_terminate_build 1
 
-%define mariadb_version		10.5.11
+%define mariadb_version		10.6.4
-%define mariadb_base_version	10.5
+%define mariadb_base_version	10.6
-%define mroonga_version		11.04
+%define mroonga_version		11.05
-%define groonga_version		11.0.4
+%define groonga_version		11.0.5
 %define client_version		18
 
 %define galera_api_version	26.4
@@ -53,6 +52,7 @@ Patch0:		mariadb-scripts.patch
 
 # replace mroonga to the newest version.
 Patch1000:	0001-MariaDB-%{mariadb_version}-Mroonga-v%{mroonga_version}-Groonga-v%{groonga_version}.patch
+Patch1001:	mroonga-mariadb-10.6.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	bison, cmake, gcc-c++, groff, git
@@ -161,24 +161,6 @@ Requires:	galera(%{galera_api_version})
  This package contains the files for MariaDB Galera Cluster.
 
 
-%ifarch x86_64
-%if %{with tokudb}
-%package tokudb
-Summary:	TokuDB storage engine for MariaDB.
-Version:	%{mariadb_version}
-Group:		servers
-Requires(pre):	mariadb-server = %{mariadb_version}-%{release}
-Requires:	mariadb-server = %{mariadb_version}-%{release}
-
-%description tokudb
-The TokuDB storage engine is for use in high-performance and
-write-intensive environments, offering increased compression and
-better performance.
-
-%endif
-%endif
-
-
 %package client
 Summary: MariaDB - Client
 Version: %{mariadb_version}
@@ -261,6 +243,9 @@ into a client application instead of running as a separate process.
 %patch0 -p1
 %endif
 git --git-dir= apply -p1 %{PATCH1000}
+pushd storage/mroonga
+%patch1001 -p1
+popd
 
 cp -f \
 	%{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE14} \
@@ -300,23 +285,12 @@ mkdir release
       -DWITH_SEQUENCE_STORAGE_ENGINE="ON" \
       -DWITH_XTRADB_STORAGE_ENGINE="ON" \
       -DWITH_JEMALLOC="yes" \
-%ifarch x86_64
-%if %{with tokudb}
-      -DTOKUDB_OK=1 \
-      -DPLUGIN_TOKUDB="DYNAMIC" \
-%else
-      -DTOKUDB_OK=0 \
-      -DPLUGIN_TOKUDB="NO" \
-%endif
-%endif
       -DGRN_WITH_MECAB="yes" \
 %if %{without onigmo}
       -DGRN_WITH_ONIGMO="no"
 %endif
       -DWITH_PCRE="system" 
 
-#      -DWITHOUT_TOKUDB="yes"
-
 ln -sf ../../../../../../release/storage/mroonga/vendor/groonga/include/groonga/version.h ../storage/mroonga/vendor/groonga/include/groonga/version.h
 
   echo BEGIN_NORMAL_CONFIG ; egrep '^#define' include/config.h ; echo END_NORMAL_CONFIG
@@ -386,19 +360,6 @@ rm -f %{buildroot}%{_sysconfdir}/my.cnf.d/client.cnf
 rm -f %{buildroot}%{_libdir}/libmysqlclient*.so*
 rm -f %{buildroot}%{_libdir}/mysql/plugin/daemon_example.ini
 
-%ifarch x86_64
-%if %{with tokudb}
-pushd release
-install -m644 ./storage/tokudb/tokudb.cnf %{buildroot}%{_sysconfdir}/my.cnf.d/
-popd
-%if %{with systemd}
-mv %{buildroot}/etc/systemd/system/mariadb.service.d/tokudb.conf %{buildroot}%{_unitdir}/mariadb.service.d/tokudb.conf
-%endif
-%endif
-%else
-rm -f %{buildroot}%{_mandir}/man1/tokuft*
-%endif
-
 # install files for galera cluster.
 install -m755 ./scripts/galera_new_cluster.sh %{buildroot}%{_bindir}/galera_new_cluster
 install -m755 ./scripts/galera_recovery.sh %{buildroot}%{_bindir}/galera_recovery
@@ -422,6 +383,7 @@ fi
 # drop client library
 rm -f %{buildroot}%{_libdir}/libmariadb.so*
 rm -f %{buildroot}%{_prefix}/lib/pkgconfig/libmariadb.pc
+rm -f %{buildroot}%{_prefix}/lib64/pkgconfig/libmariadb.pc
 
 ##############################################################################
 
@@ -566,7 +528,7 @@ fi
 %{!?_licensedir:%global license %%doc}
 %license COPYING*
 
-%doc CREDITS README.md doc/*
+%doc doc/*
 %doc support-files/rpm/*.cnf
 %doc release/support-files/*.cnf
 %doc %{_infodir}/mysql.info*
@@ -697,9 +659,6 @@ fi
 %{_bindir}/myrocks_hotbackup
 %{_bindir}/mysql_ldb
 %{_bindir}/sst_dump
-%if %{with tokudb}
-%exclude %{_libdir}/mysql/plugin/ha_tokudb.so
-%endif
 %endif
 
 %files mroonga
@@ -726,21 +685,6 @@ fi
 %{_datadir}/mysql/systemd/use_galera_new_cluster.conf
 %endif
 
-%ifarch x86_64
-%if %{with tokudb}
-%files tokudb
-%defattr(-, root, root)
-%dir %{_sysconfdir}/my.cnf.d
-%config(noreplace) %{_sysconfdir}/my.cnf.d/tokudb.cnf
-%{_libdir}/mysql/plugin/ha_tokudb.so
-%{_bindir}/tokuft*
-%doc %{_mandir}/man1/tokuft*
-%if %{with systemd}
-%{_unitdir}/mariadb.service.d/tokudb.conf
-%endif
-%endif
-%endif
-
 %files client
 %defattr(-, root, root)
 %{!?_licensedir:%global license %%doc}
@@ -809,7 +753,6 @@ fi
 %{_includedir}/mysql
 %{_datadir}/aclocal/mysql.m4
 %{_libdir}/pkgconfig/mariadb.pc
-%exclude %{_libdir}/pkgconfig/libmariadb.pc
 %{_libdir}/*.so
 %{_sysconfdir}/rpm/*
 %{_bindir}/mariadb-embedded
@@ -817,6 +760,7 @@ fi
 %doc %{_mandir}/man1/mariadb_config.1*
 %doc %{_mandir}/man1/mariadb-embedded.1*
 %doc %{_mandir}/man1/mysql_embedded.1*
+%doc %{_mandir}/man3/*
 
 %files static
 %defattr(-,root,root)
@@ -855,6 +799,11 @@ fi
 
 
 %changelog
+* Sat Aug 07 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.6.4-1
+- new upstream release.
+- updated patch1000.
+- added Patch1001 to build mroonga with mariadb-10.6.
+
 * Tue Jun 29 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.5.11-1
 - new upstream release.
 - updated patch1000.