|
@@ -11,8 +11,8 @@
|
|
|
%define _unpackaged_files_terminate_build 1
|
|
|
|
|
|
%define mariadb_base_version 10.1
|
|
|
-%define mariadb_version 10.1.23
|
|
|
-%define mroonga_version 7.02
|
|
|
+%define mariadb_version 10.2.7
|
|
|
+%define mroonga_version 7.04
|
|
|
%define client_version 18
|
|
|
|
|
|
Vendor: Project Vine
|
|
@@ -35,7 +35,8 @@ 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: mariadb-%{mariadb_version}-mroonga-v%{mroonga_version}.patch
|
|
|
+Patch1001: mroonga_for_mariadb-10.2.patch
|
|
|
|
|
|
#
|
|
|
#Patch2000: mysql-srv_buf_size.patch
|
|
@@ -207,6 +208,7 @@ 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
|
|
@@ -218,7 +220,7 @@ set -eu
|
|
|
touch optional-files-devel
|
|
|
|
|
|
export CFLAGS=${MYSQL_BUILD_CFLAGS:-${CFLAGS:-$RPM_OPT_FLAGS}}
|
|
|
-export CXXFLAGS=${MYSQL_BUILD_CXXFLAGS:-${CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-exceptions -fno-rtti}}
|
|
|
+export CXXFLAGS=${MYSQL_BUILD_CXXFLAGS:-${CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-rtti}}
|
|
|
|
|
|
# Build full release
|
|
|
mkdir release
|
|
@@ -234,6 +236,7 @@ mkdir release
|
|
|
-DWITH_EMBEDDED_SERVER="ON" \
|
|
|
-DWITH_ZLIB="system" \
|
|
|
-DWITH_LOCALES="yes" \
|
|
|
+ -DWITH_SSL="system" \
|
|
|
-DWITH_UNIT_TESTS="no" \
|
|
|
-DWITH_SEQUENCE_STORAGE_ENGINE="ON" \
|
|
|
-DWITH_XTRADB_STORAGE_ENGINE="ON" \
|
|
@@ -426,7 +429,7 @@ fi
|
|
|
%{!?_licensedir:%global license %%doc}
|
|
|
%license COPYING* EXCEPTIONS-CLIENT
|
|
|
|
|
|
-%doc CREDITS README doc/*
|
|
|
+%doc CREDITS README.md doc/*
|
|
|
%doc release/support-files/my-*.cnf
|
|
|
%doc %{_infodir}/mysql.info*
|
|
|
|
|
@@ -457,8 +460,6 @@ fi
|
|
|
%doc %{_mandir}/man1/mysql.server.1*
|
|
|
%doc %{_mandir}/man1/mysqltest.1*
|
|
|
%doc %{_mandir}/man1/mysql_tzinfo_to_sql.1*
|
|
|
-%doc %{_mandir}/man1/mysql_zap.1*
|
|
|
-%doc %{_mandir}/man1/mysqlbug.1*
|
|
|
%doc %{_mandir}/man1/perror.1*
|
|
|
%doc %{_mandir}/man1/replace.1*
|
|
|
%doc %{_mandir}/man1/resolve_stack_dump.1*
|
|
@@ -476,13 +477,14 @@ fi
|
|
|
%{_bindir}/mysql_convert_table_format
|
|
|
%{_bindir}/mysql_fix_extensions
|
|
|
%{_bindir}/mysql_install_db
|
|
|
+%ifarch x86_64
|
|
|
+%{_bindir}/mysql_ldb
|
|
|
+%endif
|
|
|
%{_bindir}/mysql_plugin
|
|
|
%{_bindir}/mysql_secure_installation
|
|
|
%{_bindir}/mysql_setpermission
|
|
|
%{_bindir}/mysql_tzinfo_to_sql
|
|
|
%{_bindir}/mysql_upgrade
|
|
|
-%{_bindir}/mysql_zap
|
|
|
-%{_bindir}/mysqlbug
|
|
|
%{_bindir}/mysqld_multi
|
|
|
%{_bindir}/mysqld_safe
|
|
|
%{_bindir}/mysqld_safe_helper
|
|
@@ -493,6 +495,9 @@ fi
|
|
|
%{_bindir}/replace
|
|
|
%{_bindir}/resolve_stack_dump
|
|
|
%{_bindir}/resolveip
|
|
|
+%ifarch x86_64
|
|
|
+%{_bindir}/sst_dump
|
|
|
+%endif
|
|
|
%{_bindir}/wsrep*
|
|
|
%{_sbindir}/mysqld
|
|
|
%{_sbindir}/rcmysql
|
|
@@ -505,9 +510,6 @@ fi
|
|
|
%{_libdir}/mysql
|
|
|
%config(noreplace) %{_sysconfdir}/my.cnf.d/enable_encryption.preset
|
|
|
%config(noreplace) %{_sysconfdir}/my.cnf.d/server.cnf
|
|
|
-%ifarch x86_64
|
|
|
-%config(noreplace) %{_sysconfdir}/my.cnf.d/tokudb.cnf
|
|
|
-%endif
|
|
|
%config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql
|
|
|
%{_sysconfdir}/init.d/mysql
|
|
|
%{_datadir}/mysql
|
|
@@ -527,6 +529,7 @@ fi
|
|
|
%ifarch x86_64
|
|
|
%files tokudb
|
|
|
%defattr(-, root, root)
|
|
|
+%config(noreplace) %{_sysconfdir}/my.cnf.d/tokudb.cnf
|
|
|
%{_libdir}/mysql/plugin/ha_tokudb.so
|
|
|
%{_bindir}/tokuft*
|
|
|
%doc %{_mandir}/man1/tokuft*
|
|
@@ -568,6 +571,7 @@ fi
|
|
|
%files devel
|
|
|
%defattr(-, root, root)
|
|
|
%doc %{_mandir}/man1/mysql_config.1*
|
|
|
+%{_bindir}/mariadb_config
|
|
|
%{_bindir}/mysql_config
|
|
|
%{_includedir}/mysql
|
|
|
%{_datadir}/aclocal/mysql.m4
|
|
@@ -601,9 +605,14 @@ fi
|
|
|
%files embedded
|
|
|
%defattr(-,root,root)
|
|
|
%{_libdir}/libmysqld.so.*
|
|
|
+%{_libdir}/libmariadb.so.*
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Jul 16 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.2.7-1
|
|
|
+- new upstream release.
|
|
|
+- replaced patch1000 to update Mroonga to v7.04.
|
|
|
+
|
|
|
* Thu May 4 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.1.23-1
|
|
|
- new upstream release.
|
|
|
- replaced patch1000 to update Mroonga to v7.02.
|