|
|
@@ -24,10 +24,10 @@
|
|
|
|
|
|
%define _unpackaged_files_terminate_build 1
|
|
|
|
|
|
-%define mariadb_version 10.6.9
|
|
|
+%define mariadb_version 10.6.11
|
|
|
%define mariadb_base_version 10.6
|
|
|
-%define mroonga_version 12.06
|
|
|
-%define groonga_version 12.0.6
|
|
|
+%define mroonga_version 12.09
|
|
|
+%define groonga_version 12.0.9
|
|
|
%define client_version 18
|
|
|
|
|
|
%define galera_api_version 26.4
|
|
|
@@ -58,15 +58,15 @@ Source20: mysql-log-rotate.sh
|
|
|
# Don't depend on lib::mtr*
|
|
|
Source998: perl-requires.sh
|
|
|
Source1000: macros.mariadb.in
|
|
|
-
|
|
|
-# temporary fix
|
|
|
-Source2000: install.sql
|
|
|
+Source1001: mysql.init
|
|
|
|
|
|
Patch0: mariadb-scripts.patch
|
|
|
Patch1: mariadb-ownsetup.patch
|
|
|
|
|
|
# replace mroonga to the newest version.
|
|
|
Patch1000: 0001-MariaDB-%{mariadb_version}-Mroonga-v%{mroonga_version}-Groonga-v%{groonga_version}.patch
|
|
|
+# already sent to upstream.
|
|
|
+Patch1001: 0001-support-MariaDB-10.10.2-10.9.4-10.8.6-10.7.7-10.6.11.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
BuildRequires: bison, cmake, gcc-c++, groff, git
|
|
|
@@ -269,6 +269,9 @@ into a client application instead of running as a separate process.
|
|
|
%endif
|
|
|
%patch1 -p1
|
|
|
git --git-dir= apply -p1 %{PATCH1000}
|
|
|
+pushd storage/mroonga
|
|
|
+%patch1001 -p1
|
|
|
+popd
|
|
|
|
|
|
cp -f \
|
|
|
%{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE14} \
|
|
|
@@ -365,6 +368,7 @@ EOF
|
|
|
rm -f %{buildroot}%{_sysconfdir}/init.d/*
|
|
|
rm -f %{buildroot}%{_libexecdir}/rcmysql
|
|
|
%else
|
|
|
+install -m755 %{SOURCE1001} %{buildroot}%{_sysconfdir}/init.d/mysql
|
|
|
mkdir -p %{buildroot}%{pidfiledir}
|
|
|
# drop systemd files.
|
|
|
rm -rf %{buildroot}%{_sysconfdir}/systemd
|
|
|
@@ -434,8 +438,6 @@ 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 +864,10 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Nov 08 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.6.11-1
|
|
|
+- new upstream release.
|
|
|
+- updated patch1000.
|
|
|
+
|
|
|
* Tue Aug 16 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.6.9-1
|
|
|
- new upstream release.
|
|
|
- updated patch1000.
|
