|
|
@@ -24,10 +24,10 @@
|
|
|
|
|
|
%define _unpackaged_files_terminate_build 1
|
|
|
|
|
|
-%define mariadb_version 10.11.5
|
|
|
+%define mariadb_version 10.11.8
|
|
|
%define mariadb_base_version 10.11
|
|
|
-%define mroonga_version 13.05
|
|
|
-%define groonga_version 13.0.5
|
|
|
+%define mroonga_version 14.04
|
|
|
+%define groonga_version 14.0.4
|
|
|
%define client_version 18
|
|
|
|
|
|
%define galera_api_version 26.4
|
|
|
@@ -59,6 +59,7 @@ Source20: mysql-log-rotate.sh
|
|
|
Source998: perl-requires.sh
|
|
|
Source1000: macros.mariadb.in
|
|
|
Source1001: mysql.init
|
|
|
+Source2000: groonga-gcc14.patch
|
|
|
|
|
|
Patch0: mariadb-scripts.patch
|
|
|
Patch1: mariadb-ownsetup.patch
|
|
|
@@ -75,7 +76,7 @@ BuildRequires: pam-devel
|
|
|
BuildRequires: unixODBC-devel
|
|
|
BuildRequires: mecab-devel
|
|
|
BuildRequires: pcre2-devel
|
|
|
-BuildRequires: zlib-devel
|
|
|
+BuildRequires: pkgconfig(zlib)
|
|
|
BuildRequires: libzstd-devel
|
|
|
BuildRequires: lz4-devel
|
|
|
Requires: fileutils sh-utils
|
|
|
@@ -209,7 +210,7 @@ This package contains the standard MariaDB clients and administration tools.
|
|
|
Summary: MariaDB - Development libraries and headers
|
|
|
Version: %{mariadb_version}
|
|
|
Group: programming
|
|
|
-Requires: %{name}-static, openssl-devel, zlib-devel
|
|
|
+Requires: %{name}-static, openssl-devel, pkgconfig(zlib)
|
|
|
Conflicts: MySQL-devel < 5.6.0
|
|
|
Conflicts: libmysqlclient-devel
|
|
|
Conflicts: libmariadb-devel
|
|
|
@@ -296,6 +297,9 @@ touch optional-files-devel
|
|
|
export CFLAGS=${MYSQL_BUILD_CFLAGS:-${CFLAGS:-$RPM_OPT_FLAGS}}
|
|
|
export CXXFLAGS=${MYSQL_BUILD_CXXFLAGS:-${CXXFLAGS:-$RPM_OPT_FLAGS}}
|
|
|
|
|
|
+# for groonga >= 13.1.1
|
|
|
+sed -i -e 's/CMAKE_CXX_STANDARD 11/CMAKE_CXX_STANDARD 17/' CMakeLists.txt
|
|
|
+
|
|
|
# Build full release
|
|
|
# workaround: force TOKUDB_OK=1
|
|
|
# https://jira.mariadb.org/browse/MDEV-14524?workflowName=MariaDB+v3&stepId=1
|
|
|
@@ -326,9 +330,14 @@ export CXXFLAGS=${MYSQL_BUILD_CXXFLAGS:-${CXXFLAGS:-$RPM_OPT_FLAGS}}
|
|
|
%endif
|
|
|
-DWITH_PCRE="system"
|
|
|
|
|
|
+%make_build -C %{_vpath_builddir} rapidjson-ep
|
|
|
+pushd %{_vpath_builddir}/storage/mroonga/groonga/rapidjson-ep-install/
|
|
|
+patch -p1 < %{SOURCE2000}
|
|
|
+popd
|
|
|
+
|
|
|
ln -sf $(pwd)/%{_vpath_builddir}/storage/mroonga/vendor/groonga/include/groonga/version.h storage/mroonga/vendor/groonga/include/groonga/version.h
|
|
|
|
|
|
-echo BEGIN_NORMAL_CONFIG ; egrep '^#define' %{_vpath_builddir}/include/config.h ; echo END_NORMAL_CONFIG
|
|
|
+echo BEGIN_NORMAL_CONFIG ; grep -E '^#define' %{_vpath_builddir}/include/config.h ; echo END_NORMAL_CONFIG
|
|
|
%cmake_build
|
|
|
|
|
|
|
|
|
@@ -396,9 +405,8 @@ rm -rf ./doc
|
|
|
mv -f %{buildroot}%{_docdir} ./
|
|
|
rm doc/README-wsrep
|
|
|
|
|
|
-rm -rf ./groonga ./groonga-normalizer-mysql
|
|
|
+rm -rf ./groonga
|
|
|
mv -f %{buildroot}%{_datadir}/groonga ./
|
|
|
-mv -f %{buildroot}%{_datadir}/groonga-normalizer-mysql ./
|
|
|
|
|
|
%if %{with source}
|
|
|
mkdir -p %{buildroot}%{_datadir}/%{name}-source
|
|
|
@@ -735,7 +743,7 @@ fi
|
|
|
%files mroonga
|
|
|
%defattr(-, root, root)
|
|
|
%{!?_licensedir:%global license %%doc}
|
|
|
-%license groonga groonga-normalizer-mysql
|
|
|
+%license groonga/COPYING
|
|
|
%{_libdir}/mysql/plugin/ha_mroonga.so
|
|
|
%{_datadir}/mysql/mroonga
|
|
|
|
|
|
@@ -875,6 +883,18 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Jun 19 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.11.8-1
|
|
|
+- new upstream release.
|
|
|
+- updated patch1000.
|
|
|
+
|
|
|
+* Tue Feb 13 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.11.7-1
|
|
|
+- new upstream release.
|
|
|
+- updated patch1000.
|
|
|
+
|
|
|
+* Wed Nov 15 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.11.6-1
|
|
|
+- new upstream release.
|
|
|
+- updated patch1000.
|
|
|
+
|
|
|
* Tue Aug 15 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.11.5-1
|
|
|
- new upstream release.
|
|
|
- updated patch1000.
|
