|
@@ -24,10 +24,10 @@
|
|
|
|
|
|
%define _unpackaged_files_terminate_build 1
|
|
|
|
|
|
-%define mariadb_version 10.11.9
|
|
|
+%define mariadb_version 10.11.10
|
|
|
%define mariadb_base_version 10.11
|
|
|
-%define mroonga_version 14.04
|
|
|
-%define groonga_version 14.0.6
|
|
|
+%define mroonga_version 14.10
|
|
|
+%define groonga_version 14.1.0
|
|
|
%define groonga_normalize_mysql_version 1.2.3
|
|
|
%define client_version 18
|
|
|
|
|
@@ -64,10 +64,9 @@ Source2000: https://github.com/mroonga/mroonga/archive/refs/tags/v%{mroonga_vers
|
|
|
|
|
|
Patch0: mariadb-scripts.patch
|
|
|
Patch1: mariadb-ownsetup.patch
|
|
|
-Patch2000: mroonga-mariadb-10.11.9.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
-BuildRequires: bison, cmake, gcc-c++, groff, git
|
|
|
+BuildRequires: bison, cmake, ninja, gcc-c++, groff, git
|
|
|
BuildRequires: libaio-devel, libboost-devel, libevent-devel, libxml2-devel
|
|
|
BuildRequires: ncurses-devel, perl, openssl-devel, readline-devel
|
|
|
BuildRequires: jemalloc-devel
|
|
@@ -282,9 +281,6 @@ into a client application instead of running as a separate process.
|
|
|
%endif
|
|
|
%patch1 -p1
|
|
|
tar xvf %{SOURCE2000}
|
|
|
-pushd mroonga-%{mroonga_version}
|
|
|
-%patch2000 -p1
|
|
|
-popd
|
|
|
|
|
|
cp -f \
|
|
|
%{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE14} \
|
|
@@ -334,19 +330,18 @@ touch optional-files-devel
|
|
|
echo BEGIN_NORMAL_CONFIG ; grep -E '^#define' %{_vpath_builddir}/include/config.h ; echo END_NORMAL_CONFIG
|
|
|
%cmake_build
|
|
|
|
|
|
+mariadb_source=`pwd`
|
|
|
+mariadb_build=`pwd`/%{_vpath_builddir}
|
|
|
+
|
|
|
pushd mroonga-%{mroonga_version}
|
|
|
-autoreconf -vif
|
|
|
-
|
|
|
-mariadb_source=`realpath -e ../`
|
|
|
-mariadb_build=`realpath -e ../%{_vpath_builddir}`
|
|
|
-
|
|
|
-%configure \
|
|
|
- --disable-static \
|
|
|
- --with-mysql-source=${mariadb_source} \
|
|
|
- --with-mysql-build=${mariadb_build} \
|
|
|
- --with-mysql-config=${mariadb_build}/scripts/mysql_config \
|
|
|
- %{?mroonga_configure_options}
|
|
|
-%make_build
|
|
|
+%cmake \
|
|
|
+ -GNinja \
|
|
|
+ -DCMAKE_BUILD_TYPE=Release \
|
|
|
+ -DMYSQL_SOURCE_DIR=${mariadb_source} \
|
|
|
+ -DMYSQL_BUILD_DIR=${mariadb_build} \
|
|
|
+ -DMYSQL_CONFIG=${mariadb_build}/scripts/mysql_config \
|
|
|
+ %{nil}
|
|
|
+%cmake_build
|
|
|
popd
|
|
|
|
|
|
|
|
@@ -360,20 +355,13 @@ install -d %{buildroot}%{_infodir}
|
|
|
%cmake_install
|
|
|
|
|
|
pushd mroonga-%{mroonga_version}
|
|
|
-%make_install
|
|
|
+%cmake_install
|
|
|
|
|
|
-rm %{buildroot}%{_libdir}/mysql/plugin/*.la
|
|
|
-rm %{buildroot}%{_libdir}/mysql/plugin/ha_mroonga.so
|
|
|
-rm %{buildroot}%{_libdir}/mysql/plugin/ha_mroonga.so.?
|
|
|
-mv %{buildroot}%{_libdir}/mysql/plugin/ha_mroonga.so.?.?.? \
|
|
|
- %{buildroot}%{_libdir}/mysql/plugin/ha_mroonga.so
|
|
|
mkdir -p %{buildroot}%{_datadir}/mysql
|
|
|
rm -rf %{buildroot}%{_datadir}/mroonga/{deb,rpm}
|
|
|
sed -i -e 's|/usr/share/mroonga/|/usr/share/mysql/mroonga/|' %{buildroot}%{_datadir}/mroonga/{install,uninstall}.sql
|
|
|
mv %{buildroot}%{_datadir}/mroonga %{buildroot}%{_datadir}/mysql/mroonga
|
|
|
popd
|
|
|
-rm -rf mroonga-doc
|
|
|
-mv %{buildroot}%{_datadir}/doc/mroonga/ mroonga-doc/
|
|
|
|
|
|
%if %{with systemd}
|
|
|
install -d %{buildroot}%{_libexecdir}
|
|
@@ -617,8 +605,6 @@ fi
|
|
|
|
|
|
|
|
|
%files server
|
|
|
-%defattr(-,root,root)
|
|
|
-%{!?_licensedir:%global license %%doc}
|
|
|
%license COPYING*
|
|
|
|
|
|
%doc doc/*
|
|
@@ -760,19 +746,14 @@ fi
|
|
|
%endif
|
|
|
|
|
|
%files mroonga
|
|
|
-%defattr(-, root, root)
|
|
|
-%{!?_licensedir:%global license %%doc}
|
|
|
%license mroonga-%{mroonga_version}/COPYING
|
|
|
-%doc mroonga-doc/*
|
|
|
%{_libdir}/mysql/plugin/ha_mroonga.so
|
|
|
%{_datadir}/mysql/mroonga
|
|
|
|
|
|
%files connect
|
|
|
-%defattr(-, root, root)
|
|
|
%{_libdir}/mysql/plugin/ha_connect.so
|
|
|
|
|
|
%files galera
|
|
|
-%defattr(-, root, root)
|
|
|
%doc Docs/README-wsrep
|
|
|
%doc %{_mandir}/man1/galera_new_cluster.1*
|
|
|
%doc %{_mandir}/man1/galera_recovery.1*
|
|
@@ -790,7 +771,6 @@ fi
|
|
|
%{_sysconfdir}/my.cnf.d/provider_lz4.cnf
|
|
|
|
|
|
%files client
|
|
|
-%defattr(-, root, root)
|
|
|
%{!?_licensedir:%global license %%doc}
|
|
|
%license COPYING*
|
|
|
|
|
@@ -849,7 +829,6 @@ fi
|
|
|
%doc %{_mandir}/man1/mytop.1*
|
|
|
|
|
|
%files devel
|
|
|
-%defattr(-, root, root)
|
|
|
%doc %{_mandir}/man1/mysql_config.1*
|
|
|
%{_bindir}/mariadb-config
|
|
|
%{_bindir}/mariadb_config
|
|
@@ -867,17 +846,14 @@ fi
|
|
|
%doc %{_mandir}/man3/*
|
|
|
|
|
|
%files static
|
|
|
-%defattr(-,root,root)
|
|
|
%{_libdir}/lib*.a
|
|
|
|
|
|
%if %{with source}
|
|
|
%files source
|
|
|
-%defattr(-, root, root)
|
|
|
%{_datadir}/mariadb-source
|
|
|
%endif
|
|
|
|
|
|
%files test
|
|
|
-%defattr(-, root, root)
|
|
|
%attr(-, root, root) %{_datadir}/mysql-test
|
|
|
%{_bindir}/mariadb-client-test
|
|
|
%{_bindir}/mariadb-client-test-embedded
|
|
@@ -898,11 +874,13 @@ fi
|
|
|
%doc %{_mandir}/man1/mysqltest_embedded.1*
|
|
|
|
|
|
%files embedded
|
|
|
-%defattr(-,root,root)
|
|
|
%{_libdir}/libmariadbd.so.*
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Mon Nov 11 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.11.10-1
|
|
|
+- new upstream release.
|
|
|
+
|
|
|
* Fri Aug 16 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.11.9-1
|
|
|
- new upstream release.
|
|
|
|