Sfoglia il codice sorgente

mariadb-10.1.11-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@10010 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 9 anni fa
parent
commit
f825412773
1 ha cambiato i file con 67 aggiunte e 10 eliminazioni
  1. 67 10
      m/mariadb/mariadb-vl.spec

+ 67 - 10
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.9
-%define mroonga_version		5.10
+%define mariadb_version		10.1.11
+%define mroonga_version		5.12
 %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:	4%{_dist_release}
+Release:	1%{_dist_release}
 
 Group:		Applications/Databases
 License:	GPL2
@@ -33,8 +33,8 @@ Source:		mariadb-%{version}.tar.gz
 Source998:	perl-requires.sh
 Source1000:	macros.mariadb.in
 
-# mroonga 5.04 -> git master
-patch1000: mariadb-10.1.9-mroonga-master.patch
+# mroonga 5.04 -> 5.12
+patch1000: mariadb-%{mariadb_version}-mroonga-v%{mroonga_version}.patch
 
 #
 #Patch2000:	mysql-srv_buf_size.patch
@@ -44,6 +44,7 @@ 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:	unixODBC-devel
 BuildRequires:	zlib-devel
 BuildRequires:	mecab-devel
 Requires:		fileutils sh-utils
@@ -63,7 +64,7 @@ MariaDB bug reports should be submitted through https://mariadb.atlassian.net/
 
 %package server
 Version:	%{mariadb_version}
-Release: %{release}
+Release:	%{release}
 Summary:	MariaDB: a very fast and robust SQL database server
 Group:		Applications/Databases
 Requires:	fileutils sh-utils net-tools mariadb-common
@@ -97,6 +98,40 @@ Mroonga is a fast fulltext searchable storage plugin for MariaDB.
 It is based on groonga that is a fast fulltext search engine and
 column store. Groonga is good at real-time update.
 
+%package connect
+Version:	%{mariadb_version}
+Summary:	CONNECT storage engine for MariaDB.
+Group:		Applications/Databases
+Requires(pre):	mariadb-server = %{mariadb_version}-%{release}
+Requires:	mariadb-server = %{mariadb_version}-%{release}
+
+%description connect
+The CONNECT storage engine enables MariaDB to access external
+local or remote data (MED). This is done by defining tables
+based on different data types, in particular files in various
+formats, data extracted from other DBMS or products (such as Excel)
+via ODBC, or data retrieved from the environment (for example
+DIR, WMI, and MAC tables).
+
+This storage engine supports table partitioning, MariaDB virtual
+columns and also permits defining special columns such as ROWID,
+FILEID, and SERVID.
+
+%ifarch x86_64
+%package tokudb
+Version:	%{mariadb_version}
+Summary:	TokuDB storage engine for MariaDB.
+Group:		Applications/Databases
+Requires(pre):	mariadb-server = %{mariadb_version}-%{release}
+Requires:	mariadb-server = %{mariadb_version}-%{release}
+
+%description tokudb
+The TokuDB storage engine is for use in high-performance and
+write-intensive environments, offering increased compression and
+better performance.
+
+%endif
+
 %package client
 Version:	%{mariadb_version}
 Summary: MariaDB - Client
@@ -199,7 +234,6 @@ mkdir release
       -DWITH_ZLIB="system" \
       -DWITH_LOCALES="yes" \
       -DWITH_UNIT_TESTS="no" \
-      -DWITH_CONNECT_STORAGE_ENGINE="ON" \
       -DWITH_SEQUENCE_STORAGE_ENGINE="ON" \
       -DWITH_XTRADB_STORAGE_ENGINE="ON" \
       -DWITH_JEMALLOC="yes" \
@@ -256,6 +290,8 @@ 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
@@ -442,13 +478,14 @@ fi
 %{_bindir}/replace
 %{_bindir}/resolve_stack_dump
 %{_bindir}/resolveip
-%ifarch x86_64
-%{_bindir}/tokuft*
-%endif
 %{_bindir}/wsrep*
 %{_sbindir}/mysqld
 %{_sbindir}/rcmysql
+%exclude %{_libdir}/mysql/plugin/ha_connect.so
 %exclude %{_libdir}/mysql/plugin/ha_mroonga.so
+%ifarch x86_64
+%exclude %{_libdir}/mysql/plugin/ha_tokudb.so
+%endif
 %exclude %{_datadir}/mysql/mroonga
 %{_libdir}/mysql
 %config(noreplace) %{_sysconfdir}/my.cnf.d/enable_encryption.preset
@@ -467,6 +504,17 @@ fi
 %{_libdir}/mysql/plugin/ha_mroonga.so
 %{_datadir}/mysql/mroonga
 
+%files connect
+%defattr(-, root, root)
+%{_libdir}/mysql/plugin/ha_connect.so
+
+%ifarch x86_64
+%files tokudb
+%defattr(-, root, root)
+%{_libdir}/mysql/plugin/ha_tokudb.so
+%{_bindir}/tokuft*
+%endif
+
 %files client
 %defattr(-, root, root)
 %config(noreplace) %{_sysconfdir}/my.cnf.d/mysql-clients.cnf
@@ -536,6 +584,15 @@ fi
 
 
 %changelog
+* 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.
+
+* Fri Jan  8 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.1.10-1
+- new upstream release.
+- replaced patch1000 to update Mroonga to v5.11.
+- moved CONNECT and TokuDB storage engines to subpackages.
+
 * Sun Nov 29 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.1.9-4
 - replaced patch1000 to update Mroonga to git HEAD.