|
@@ -24,10 +24,10 @@
|
|
|
|
|
|
%define _unpackaged_files_terminate_build 1
|
|
|
|
|
|
-%define mariadb_version 10.6.8
|
|
|
+%define mariadb_version 10.6.9
|
|
|
%define mariadb_base_version 10.6
|
|
|
-%define mroonga_version 12.03
|
|
|
-%define groonga_version 12.0.3
|
|
|
+%define mroonga_version 12.06
|
|
|
+%define groonga_version 12.0.6
|
|
|
%define client_version 18
|
|
|
|
|
|
%define galera_api_version 26.4
|
|
@@ -59,6 +59,9 @@ Source20: mysql-log-rotate.sh
|
|
|
Source998: perl-requires.sh
|
|
|
Source1000: macros.mariadb.in
|
|
|
|
|
|
+# temporary fix
|
|
|
+Source2000: install.sql
|
|
|
+
|
|
|
Patch0: mariadb-scripts.patch
|
|
|
Patch1: mariadb-ownsetup.patch
|
|
|
|
|
@@ -265,7 +268,6 @@ into a client application instead of running as a separate process.
|
|
|
%patch0 -p1
|
|
|
%endif
|
|
|
%patch1 -p1
|
|
|
-sed -i -e 's/"3.0.0"/"4.0.0"/' cmake/ssl.cmake
|
|
|
git --git-dir= apply -p1 %{PATCH1000}
|
|
|
|
|
|
cp -f \
|
|
@@ -275,10 +277,6 @@ cp -f \
|
|
|
|
|
|
cp -f %{SOURCE20} support-files/
|
|
|
|
|
|
-# for OpenSSL 3.0.0
|
|
|
-sed -i -e 's/#define EVP_MD_CTX_SIZE 48/#define EVP_MD_CTX_SIZE 72/' \
|
|
|
- include/ssl_compat.h
|
|
|
-
|
|
|
|
|
|
%build
|
|
|
# Be strict about variables, bail at earliest opportunity, etc.
|
|
@@ -436,6 +434,8 @@ rm -f %{buildroot}%{_libdir}/libmariadb.so*
|
|
|
rm -f %{buildroot}%{_prefix}/lib/pkgconfig/libmariadb.pc
|
|
|
rm -f %{buildroot}%{_prefix}/lib64/pkgconfig/libmariadb.pc
|
|
|
|
|
|
+install -p -m 644 %{SOURCE2000} %{buildroot}%{_datadir}/mysql/mroonga/
|
|
|
+
|
|
|
##############################################################################
|
|
|
|
|
|
%pre server
|
|
@@ -862,6 +862,10 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Aug 16 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.6.9-1
|
|
|
+- new upstream release.
|
|
|
+- updated patch1000.
|
|
|
+
|
|
|
* Sat May 21 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.6.8-1
|
|
|
- new upstream release.
|
|
|
- updated patch1000.
|