|
|
@@ -11,8 +11,9 @@
|
|
|
%define _unpackaged_files_terminate_build 1
|
|
|
|
|
|
%define mariadb_base_version 10.2
|
|
|
-%define mariadb_version 10.3.10
|
|
|
-%define mroonga_version 8.07
|
|
|
+%define mariadb_version 10.3.11
|
|
|
+%define mroonga_version 8.09
|
|
|
+%define groonga_version 8.0.9
|
|
|
%define client_version 18
|
|
|
|
|
|
Vendor: Project Vine
|
|
|
@@ -22,7 +23,7 @@ Packager: tomop
|
|
|
Name: mariadb
|
|
|
Summary: MariaDB: a very fast and robust SQL database server
|
|
|
Version: %{mariadb_version}
|
|
|
-Release: 2%{_dist_release}
|
|
|
+Release: 1%{_dist_release}
|
|
|
|
|
|
Group: Applications/Databases
|
|
|
License: GPL2
|
|
|
@@ -35,7 +36,7 @@ Source1000: macros.mariadb.in
|
|
|
|
|
|
# replace mroonga to the newest version.
|
|
|
#patch1000: mariadb-%{mariadb_version}-mroonga-master.patch
|
|
|
-Patch1000: mariadb-%{mariadb_version}-mroonga-v%{mroonga_version}.patch
|
|
|
+Patch1000: 0001-MariaDB-%{mariadb_version}-Mroonga-v%{mroonga_version}-Groonga-v%{groonga_version}.patch
|
|
|
#Patch1001: mroonga_for_mariadb-10.2.patch
|
|
|
|
|
|
#
|
|
|
@@ -152,6 +153,7 @@ Group: Development/Libraries
|
|
|
Requires: %{name}-static, openssl-devel, zlib-devel
|
|
|
Conflicts: MySQL-devel < 5.6.0
|
|
|
Conflicts: libmysqlclient-devel
|
|
|
+Conflicts: libmariadb-devel
|
|
|
|
|
|
%description devel
|
|
|
This package contains the development libraries and headers to develop
|
|
|
@@ -208,8 +210,6 @@ into a client application instead of running as a separate process.
|
|
|
%prep
|
|
|
%setup -q
|
|
|
%patch1000 -p1 -b .mroonga
|
|
|
-#%patch1001 -p1 -b .mariadb-10.2
|
|
|
-#%patch2000 -p1 -b .srv_buf_size
|
|
|
|
|
|
%build
|
|
|
|
|
|
@@ -253,6 +253,8 @@ mkdir release
|
|
|
# -DWITHOUT_TOKUDB="yes"
|
|
|
# -DWITH_PCRE="system"
|
|
|
|
|
|
+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
|
|
|
make %{?_smp_mflags} VERBOSE=1
|
|
|
)
|
|
|
@@ -304,16 +306,16 @@ rm -f %{buildroot}%{_mandir}/man1/tokuft*
|
|
|
%endif
|
|
|
|
|
|
# force linking statically.
|
|
|
-perl -pi -e 's,-lmysqlclient_r,%{_libdir}/libmysqlclient_r.a,' %{buildroot}%{_bindir}/mysql_config
|
|
|
-perl -pi -e 's,-lmysqlclient,%{_libdir}/libmysqlclient.a,' %{buildroot}%{_bindir}/mysql_config
|
|
|
+perl -pi -e 's,-lmariadb,%{_libdir}/libmariadbclient.a,' %{buildroot}%{_bindir}/mysql_config
|
|
|
|
|
|
-perl -pi -e 's,-lmysqlclient,%{_libdir}/libmysqlclient.a,' %{buildroot}%{_datadir}/pkgconfig/mariadb.pc
|
|
|
+perl -pi -e 's,-lmariadb,%{_libdir}/libmariadbclient.a,' %{buildroot}%{_datadir}/pkgconfig/mariadb.pc
|
|
|
|
|
|
# drop systemd files.
|
|
|
rm -rf %{buildroot}%{_sysconfdir}/systemd
|
|
|
|
|
|
# drop client library
|
|
|
rm -f %{buildroot}%{_libdir}/libmariadb.so*
|
|
|
+rm -f %{buildroot}%{_prefix}/lib/pkgconfig/libmariadb.pc
|
|
|
|
|
|
##############################################################################
|
|
|
|
|
|
@@ -627,6 +629,10 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Nov 30 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.3.11-1
|
|
|
+- new upstream release.
|
|
|
+- replaced patch1000 to update Mroonga to v8.09.
|
|
|
+
|
|
|
* Mon Nov 05 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.3.10-2
|
|
|
- drop shared client library.
|
|
|
|
tomop