mariadb-10.0.10-2, mariadb-mroonga-4.01-2

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

m/mariadb-mroonga/mariadb-mroonga-vl.spec

@@ -8,7 +8,7 @@
 
 Name:		mariadb-mroonga
 Version:	4.01
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 Summary:	A fast fulltext searchable storage engine for MariaDB.
 
 Group:		Applications/Databases
@@ -73,10 +73,14 @@ rm -rf %{buildroot}
 %post
 if [ "$1" = 2 ] ; then
     sql="
-    DROP FUNCTION last_insert_grn_id;
-    UNINSTALL PLUGIN mroonga;
-    FLUSH TABLES;
-    "
+USE mysql;
+DROP FUNCTION IF EXISTS mroonga_snippet;
+DROP FUNCTION IF EXISTS last_insert_grn_id;
+DROP FUNCTION IF EXISTS mroonga_command;
+DROP FUNCTION IF EXISTS mroonga_escape;
+UNINSTALL PLUGIN mroonga;
+FLUSH TABLES;
+"
     command="/usr/bin/mysql -u root -e \"$sql\""
     echo $command
     eval $command || \
@@ -86,7 +90,10 @@ fi
 sql="
 DELETE IGNORE FROM mysql.plugin WHERE name = 'mroonga';
 INSTALL PLUGIN mroonga SONAME 'ha_mroonga.so';
-CREATE FUNCTION last_insert_grn_id RETURNS INTEGER soname 'ha_mroonga.so';
+CREATE FUNCTION last_insert_grn_id RETURNS INTEGER SONAME 'ha_mroonga.so';
+CREATE FUNCTION mroonga_snippet RETURNS STRING SONAME 'ha_mroonga.so';
+CREATE FUNCTION mroonga_command RETURNS STRING SONAME 'ha_mroonga.so';
+CREATE FUNCTION mroonga_escape RETURNS STRING SONAME 'ha_mroonga.so';
 "
 command="/usr/bin/mysql -u root -e \"$sql\""
 echo $command
@@ -97,10 +104,14 @@ eval $command || \
 %preun
 if [ "$1" = 0 ]; then
     sql="
-    DROP FUNCTION last_insert_grn_id;
-    UNINSTALL PLUGIN mroonga;
-    FLUSH TABLES;
-    "
+USE mysql;
+DROP FUNCTION IF EXISTS mroonga_snippet;
+DROP FUNCTION IF EXISTS last_insert_grn_id;
+DROP FUNCTION IF EXISTS mroonga_command;
+DROP FUNCTION IF EXISTS mroonga_escape;
+UNINSTALL PLUGIN mroonga;
+FLUSH TABLES;
+"
     command="/usr/bin/mysql -u root -e \"$sql\""
     echo $command
     eval $command || \
@@ -120,6 +131,9 @@ fi
 %doc mysql-mroonga-doc/*
 
 %changelog
+* Sun Apr 13 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.01-2
+- fixed %%post and %%preun scripts.
+
 * Fri Apr 11 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.01-1
 - new upstream release.
 - added Patch0 and Patch1.

m/mariadb/mariadb-vl.spec

@@ -9,7 +9,7 @@
 %define _unpackaged_files_terminate_build 1
 
 %define mariadb_base_version	10.0
-%define mariadb_version		10.0.9
+%define mariadb_version		10.0.10
 %define client_version		18
 
 Vendor: Project Vine
@@ -19,7 +19,7 @@ Packager:	tomop
 Name: mariadb
 Summary:	MariaDB: a very fast and robust SQL database server
 Version:	%{mariadb_version}
-Release:	1%{_dist_release}
+Release:	2%{_dist_release}
 
 Group:		Applications/Databases
 License:	GPL2
@@ -87,7 +87,7 @@ This package contains the standard MariaDB clients and administration tools.
 Summary: MariaDB - Development libraries and headers
 Group: Development/Libraries
 Requires: %{name}-static, openssl-devel, zlib-devel
-Obsoletes: MySQL-devel < 5.6.0
+Conflicts: MySQL-devel < 5.6.0
 Conflicts: libmysqlclient-devel
 
 %description devel
@@ -435,6 +435,9 @@ fi
 
 
 %changelog
+* Sun Apr 13 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.0.10-2
+- fixed Conflicts: and Obsoletes:.
+
 * Mon Mar 31 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.0.10-1
 - new upstream release.