Browse Source

mariadb-10.2.11-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11252 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 5 years ago
parent
commit
91924415a0
1 changed files with 17 additions and 5 deletions
  1. 17 5
      m/mariadb/mariadb-vl.spec

+ 17 - 5
m/mariadb/mariadb-vl.spec

@@ -11,8 +11,8 @@
 %define _unpackaged_files_terminate_build 1
 
 %define mariadb_base_version	10.1
-%define mariadb_version		10.2.7
-%define mroonga_version		7.04
+%define mariadb_version		10.2.11
+%define mroonga_version		7.09
 %define client_version		18
 
 Vendor: Project Vine
@@ -36,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
-Patch1001: mroonga_for_mariadb-10.2.patch
+#Patch1001: mroonga_for_mariadb-10.2.patch
 
 #
 #Patch2000:	mysql-srv_buf_size.patch
@@ -208,7 +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
+#%patch1001 -p1 -b .mariadb-10.2
 #%patch2000 -p1 -b .srv_buf_size
 
 %build
@@ -223,6 +223,9 @@ export CFLAGS=${MYSQL_BUILD_CFLAGS:-${CFLAGS:-$RPM_OPT_FLAGS}}
 export CXXFLAGS=${MYSQL_BUILD_CXXFLAGS:-${CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-rtti}}
 
 # Build full release
+# workaround: force TOKUDB_OK=1
+# https://jira.mariadb.org/browse/MDEV-14524?workflowName=MariaDB+v3&stepId=1
+
 mkdir release
 (
   cd release
@@ -241,6 +244,9 @@ mkdir release
       -DWITH_SEQUENCE_STORAGE_ENGINE="ON" \
       -DWITH_XTRADB_STORAGE_ENGINE="ON" \
       -DWITH_JEMALLOC="yes" \
+%ifarch x86_64
+      -DTOKUDB_OK=1 \
+%endif
       -DGRN_WITH_MECAB="yes" \
       -DGRN_WITH_ONIGMO="no"
 
@@ -289,7 +295,9 @@ rm -f %{buildroot}%{_sysconfdir}/my.cnf.d/client.cnf
 rm -f %{buildroot}%{_libdir}/libmysqlclient*.so*
 rm -f %{buildroot}%{_libdir}/mysql/plugin/daemon_example.ini
 
-%ifarch %{ix86}
+%ifarch x86_64
+install -m644 ./storage/tokudb/tokudb.cnf %{buildroot}%{_sysconfdir}/my.cnf.d/
+%else
 rm -f %{buildroot}%{_mandir}/man1/tokuft*
 %endif
 
@@ -609,6 +617,10 @@ fi
 
 
 %changelog
+* Sat Dec 02 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.2.11-1
+- new upstream release.
+- replaced patch1000 to update Mroonga to v7.09.
+
 * 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.