mariadb-10.1.9-4

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9835 ec354946-7b23-47d6-9f5a-488ba84defc7

m/mariadb/mariadb-vl.spec

@@ -11,8 +11,8 @@
 %define _unpackaged_files_terminate_build 1
 
 %define mariadb_base_version	10.0
-%define mariadb_version		10.0.21
-%define mroonga_version		5.06
+%define mariadb_version		10.1.9
+%define mroonga_version		5.10
 %define client_version		18
 
 Vendor: Project Vine
@@ -22,7 +22,7 @@ Packager:	tomop
 Name: mariadb
 Summary:	MariaDB: a very fast and robust SQL database server
 Version:	%{mariadb_version}
-Release:	2%{_dist_release}
+Release:	4%{_dist_release}
 
 Group:		Applications/Databases
 License:	GPL2
@@ -33,16 +33,17 @@ Source:		mariadb-%{version}.tar.gz
 Source998:	perl-requires.sh
 Source1000:	macros.mariadb.in
 
-# mroonga 5.02 -> 5.06
-patch1000: mariadb-10.0.21-mroonga-5.06.patch
+# mroonga 5.04 -> git master
+patch1000: mariadb-10.1.9-mroonga-master.patch
 
 #
-Patch2000:	mysql-srv_buf_size.patch
+#Patch2000:	mysql-srv_buf_size.patch
 
 BuildRoot:		%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	bison, cmake, gcc-c++, groff
 BuildRequires:	libaio-devel, libboost-devel, libevent-devel, libxml2-devel
 BuildRequires:	ncurses-devel, perl, openssl-devel, readline-devel
+BuildRequires:	jemalloc-devel
 BuildRequires:	zlib-devel
 BuildRequires:	mecab-devel
 Requires:		fileutils sh-utils
@@ -170,7 +171,7 @@ into a client application instead of running as a separate process.
 %prep
 %setup -q
 %patch1000 -p1 -b .mroonga
-%patch2000 -p1 -b .srv_buf_size
+#%patch2000 -p1 -b .srv_buf_size
 
 %build
 
@@ -201,10 +202,11 @@ mkdir release
       -DWITH_CONNECT_STORAGE_ENGINE="ON" \
       -DWITH_SEQUENCE_STORAGE_ENGINE="ON" \
       -DWITH_XTRADB_STORAGE_ENGINE="ON" \
-      -DWITHOUT_TOKUDB=1 \
-      -DWITH_JEMALLOC="no" \
-      -DGRN_WITH_MECAB="yes"
+      -DWITH_JEMALLOC="yes" \
+      -DGRN_WITH_MECAB="yes" \
+      -DGRN_WITH_ONIGMO="no"
 
+#      -DWITHOUT_TOKUDB="yes"
 #      -DWITH_PCRE="system" 
 
   echo BEGIN_NORMAL_CONFIG ; egrep '^#define' include/config.h ; echo END_NORMAL_CONFIG
@@ -228,6 +230,8 @@ install -m 0644  Docs/mysql.info %{buildroot}%{_infodir}
 rm -rf ./doc
 mv -f %{buildroot}%{_docdir} ./
 
+mv -f %{buildroot}%{_datadir}/groonga ./
+
 %if %{with source}
 mkdir -p %{buildroot}%{_datadir}/%{name}-source
 pushd %{buildroot}%{_datadir}/%{name}-source
@@ -250,6 +254,8 @@ rm -f %{buildroot}%{_libdir}/mysql/plugin/daemon_example.ini
 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,-lmysqlclient,%{_libdir}/libmysqlclient.a,' %{buildroot}%{_datadir}/pkgconfig/mariadb.pc
+
 ##############################################################################
 
 %pre server
@@ -285,6 +291,16 @@ if [ $1 = 1 ] ; then
     fi
   fi
 
+  tmpdir=`/usr/bin/my_print_defaults --mysqld|sed -ne 's/^--datadir=//p'|tail -1`
+  if [ -z "$datadir" ] ; then
+    datadir=/var/lib/mysql
+  else
+    # datadir may be relative to a basedir!
+    if ! expr $datadir : / > /dev/null; then
+      datadir=$basedir/$datadir
+    fi
+  fi
+
   # Change permissions so that the user that will run the MySQL daemon
   # owns all database files.
   chown -R mysql:mysql $datadir
@@ -292,6 +308,7 @@ if [ $1 = 1 ] ; then
   if [ ! -e $datadir/mysql ]; then
     # Create data directory
     mkdir -p $datadir/{mysql,test}
+    chown -R mysql:mysql $datadir
 
     # Initiate databases
     /usr/bin/mysql_install_db --rpm --user=mysql
@@ -425,13 +442,20 @@ fi
 %{_bindir}/replace
 %{_bindir}/resolve_stack_dump
 %{_bindir}/resolveip
-#%{_bindir}/tokuftdump
+%ifarch x86_64
+%{_bindir}/tokuft*
+%endif
+%{_bindir}/wsrep*
 %{_sbindir}/mysqld
+%{_sbindir}/rcmysql
 %exclude %{_libdir}/mysql/plugin/ha_mroonga.so
 %exclude %{_datadir}/mysql/mroonga
 %{_libdir}/mysql
+%config(noreplace) %{_sysconfdir}/my.cnf.d/enable_encryption.preset
 %config(noreplace) %{_sysconfdir}/my.cnf.d/server.cnf
-#%config(noreplace) %{_sysconfdir}/my.cnf.d/tokudb.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
@@ -439,6 +463,7 @@ fi
 
 %files mroonga
 %defattr(-, root, root)
+%doc groonga
 %{_libdir}/mysql/plugin/ha_mroonga.so
 %{_datadir}/mysql/mroonga
 
@@ -478,6 +503,7 @@ fi
 %{_bindir}/mysql_config
 %{_includedir}/mysql
 %{_datadir}/aclocal/mysql.m4
+%{_datadir}/pkgconfig/mariadb.pc
 %{_libdir}/*.so
 %{_sysconfdir}/rpm/*
 %{_bindir}/mysql_embedded
@@ -510,6 +536,32 @@ fi
 
 
 %changelog
+* Sun Nov 29 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.1.9-4
+- replaced patch1000 to update Mroonga to git HEAD.
+
+* Sat Nov 28 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.1.9-3
+- replaced patch1000 to update Mroonga to git HEAD.
+
+* Thu Nov 26 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.1.9-2
+- replaced patch1000 to update Mroonga to git HEAD.
+
+* Tue Nov 24 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.1.9-1
+- new upstream release.
+- replaced patch1000 to update Mroonga to git HEAD.
+
+* Fri Oct 30 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.1.8-3
+- added BR:jemalloc-devel.
+
+* Thu Oct 29 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.1.8-2
+- replaced patch1000 to update Mroonga to 5.09.
+
+* Wed Oct 21 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.1.8-1
+- new upstream release.
+- replaced patch1000 for MariaDB 10.1.8.
+
+* Fri Oct  9 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.0.21-3
+- replaced patch1000 to update Mroonga to 5.08.
+
 * Mon Aug 31 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.0.21-2
 - replaced patch1000 to update Mroonga to 5.06.