|
@@ -11,8 +11,8 @@
|
|
|
%define _unpackaged_files_terminate_build 1
|
|
%define _unpackaged_files_terminate_build 1
|
|
|
|
|
|
|
|
%define mariadb_base_version 10.0
|
|
%define mariadb_base_version 10.0
|
|
|
-%define mariadb_version 10.0.20
|
|
|
|
|
-%define mroonga_version 5.02
|
|
|
|
|
|
|
+%define mariadb_version 10.0.21
|
|
|
|
|
+%define mroonga_version 5.04
|
|
|
%define client_version 18
|
|
%define client_version 18
|
|
|
|
|
|
|
|
Vendor: Project Vine
|
|
Vendor: Project Vine
|
|
@@ -32,9 +32,12 @@ Source: mariadb-%{version}.tar.gz
|
|
|
# Don't depend on lib::mtr*
|
|
# Don't depend on lib::mtr*
|
|
|
Source998: perl-requires.sh
|
|
Source998: perl-requires.sh
|
|
|
Source1000: macros.mariadb.in
|
|
Source1000: macros.mariadb.in
|
|
|
-Patch0: mysql-5.5.15-jp-all.patch
|
|
|
|
|
|
|
|
|
|
-Patch100: mysql-srv_buf_size.patch
|
|
|
|
|
|
|
+# mroonga 5.02 -> 5.05
|
|
|
|
|
+patch1000: mariadb-10.0.21-mroonga-5.05.patch
|
|
|
|
|
+
|
|
|
|
|
+#
|
|
|
|
|
+Patch2000: mysql-srv_buf_size.patch
|
|
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
BuildRequires: bison, cmake, gcc-c++, groff
|
|
BuildRequires: bison, cmake, gcc-c++, groff
|
|
@@ -84,6 +87,8 @@ Summary: A fast fulltext searchable storage engine for MariaDB.
|
|
|
Group: Applications/Databases
|
|
Group: Applications/Databases
|
|
|
Requires(pre): mariadb-server = %{mariadb_version}-%{release}
|
|
Requires(pre): mariadb-server = %{mariadb_version}-%{release}
|
|
|
Requires: mariadb-server = %{mariadb_version}-%{release}
|
|
Requires: mariadb-server = %{mariadb_version}-%{release}
|
|
|
|
|
+Obsoletes: MySQL-mroonga < 4.02
|
|
|
|
|
+Obsoletes: mariadb-mroonga < 4.07
|
|
|
Obsoletes: mariadb-mroonga-doc < 4.07
|
|
Obsoletes: mariadb-mroonga-doc < 4.07
|
|
|
|
|
|
|
|
%description mroonga
|
|
%description mroonga
|
|
@@ -164,8 +169,8 @@ into a client application instead of running as a separate process.
|
|
|
|
|
|
|
|
%prep
|
|
%prep
|
|
|
%setup -q
|
|
%setup -q
|
|
|
-#%patch0 -p1 -b .jp
|
|
|
|
|
-%patch100 -p1 -b .srv_buf_size
|
|
|
|
|
|
|
+%patch1000 -p1 -b .mroonga
|
|
|
|
|
+%patch2000 -p1 -b .srv_buf_size
|
|
|
|
|
|
|
|
%build
|
|
%build
|
|
|
|
|
|
|
@@ -326,7 +331,7 @@ fi
|
|
|
%pre mroonga
|
|
%pre mroonga
|
|
|
if [ $1 -gt 1 ]; then
|
|
if [ $1 -gt 1 ]; then
|
|
|
/usr/bin/mysql -u root < %{_datadir}/mysql/mroonga/uninstall.sql || cat <<EOF
|
|
/usr/bin/mysql -u root < %{_datadir}/mysql/mroonga/uninstall.sql || cat <<EOF
|
|
|
-An error occured when to register plugin.
|
|
|
|
|
|
|
+An error occured when to unregister plugin.
|
|
|
Please run a command below:
|
|
Please run a command below:
|
|
|
|
|
|
|
|
/usr/bin/mysql -u root < %{_datadir}/mysql/mroonga/uninstall.sql
|
|
/usr/bin/mysql -u root < %{_datadir}/mysql/mroonga/uninstall.sql
|
|
@@ -507,6 +512,13 @@ fi
|
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
|
+* Mon Aug 10 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.0.21-1
|
|
|
|
|
+- new upstream release.
|
|
|
|
|
+- added patch1000 to update Mroonga from 5.02 to 5.05.
|
|
|
|
|
+
|
|
|
|
|
+* Tue Jun 30 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.0.20-2
|
|
|
|
|
+- fixed dependencies.
|
|
|
|
|
+
|
|
|
* Fri Jun 19 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.0.20-1
|
|
* Fri Jun 19 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.0.20-1
|
|
|
- new upstream release.
|
|
- new upstream release.
|
|
|
|
|
|
tomop