mariadb-10.1.12-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@10088 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.1.11
-%define mroonga_version		5.12
+%define mariadb_version		10.1.12
+%define mroonga_version		6.00
 %define client_version		18
 
 Vendor: Project Vine
@@ -33,8 +33,9 @@ Source:		mariadb-%{version}.tar.gz
 Source998:	perl-requires.sh
 Source1000:	macros.mariadb.in
 
-# mroonga 5.04 -> 5.12
-patch1000: mariadb-%{mariadb_version}-mroonga-v%{mroonga_version}.patch
+# mroonga 5.04 -> HEAD
+patch1000: mariadb-%{mariadb_version}-mroonga-master.patch
+#patch1000: mariadb-%{mariadb_version}-mroonga-v%{mroonga_version}.patch
 
 #
 #Patch2000:	mysql-srv_buf_size.patch
@@ -290,8 +291,6 @@ perl -pi -e 's,-lmysqlclient,%{_libdir}/libmysqlclient.a,' %{buildroot}%{_bindir
 
 perl -pi -e 's,-lmysqlclient,%{_libdir}/libmysqlclient.a,' %{buildroot}%{_datadir}/pkgconfig/mariadb.pc
 
-mv -f %{buildroot}%{_bindir}/maria_add_gis_sp.sql %{buildroot}%{_datadir}/mysql
-
 ##############################################################################
 
 %pre server
@@ -584,6 +583,10 @@ fi
 
 
 %changelog
+* Tue Mar 15 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.1.12-1
+- new upstream release.
+- replaced patch1000 to update Mroonga to git HEAD.
+
 * Sat Jan 30 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.1.11-1
 - new upstream release.
 - replaced patch1000 to update Mroonga to v5.12.