[mariadb-galera] oqgraph engine to align with upstream packages
Honza Horak
hhorak at fedoraproject.org
Tue Sep 30 19:29:55 UTC 2014
commit b54a01312be3dc54324dfb173eff3a3c17ae5cc5
Author: Honza Horak <hhorak at redhat.com>
Date: Tue Sep 30 18:30:11 2014 +0200
oqgraph engine to align with upstream packages
mariadb-galera.spec | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 deletions(-)
---
diff --git a/mariadb-galera.spec b/mariadb-galera.spec
index b174c71..2e569be 100644
--- a/mariadb-galera.spec
+++ b/mariadb-galera.spec
@@ -36,6 +36,7 @@
%bcond_with errmsg
%bcond_with bench
%bcond_with test
+%bcond_with connect
# When there is already another package that ships /etc/my.cnf,
# rather include it than ship the file again, since conflicts between
@@ -335,7 +336,7 @@ MariaDB is a community developed branch of MySQL.
%if %{with oqgraph}
-%package oqgraph
+%package oqgraph-engine
Summary: The Open Query GRAPH engine for MariaDB
Group: Applications/Databases
Requires: %{name}-server%{?_isa} = %{sameevr}
@@ -343,7 +344,7 @@ Requires: %{name}-server%{?_isa} = %{sameevr}
BuildRequires: boost-devel
BuildRequires: Judy-devel
-%description oqgraph
+%description oqgraph-engine
The package provides Open Query GRAPH engine (OQGRAPH) as plugin for MariaDB
database server. OQGRAPH is a computation engine allowing hierarchies and more
complex graph structures to be handled in a relational fashion. In a nutshell,
@@ -352,6 +353,21 @@ standard SQL syntax, and results joined onto other tables.
%endif
+%if %{with connect}
+%package connect-engine
+Summary: The CONNECT storage engine for MariaDB
+Group: Applications/Databases
+Requires: %{name}-server%{?_isa} = %{sameevr}
+
+%description connect-engine
+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), or data retrieved from the environment
+(for example DIR, WMI, and MAC tables).
+%endif
+
+
%if %{with devel}
%package devel
Summary: Files for development of MariaDB/MySQL applications
@@ -798,7 +814,11 @@ aria_pack,aria_read_log}
rm -f %{buildroot}%{_mandir}/man1/{mysql,mysql_find_rows,mysql_waitpid,\
mysqlaccess,mysqladmin,mysqldump,mysqlshow,mysqlslap,\
my_print_defaults,aria_chk,aria_dump_log,aria_ftdump,aria_pack,aria_read_log}.1*
-rm -f %{buildroot}%{_sysconfdir}/my.cnf.d/{client,connect}.cnf
+rm -f %{buildroot}%{_sysconfdir}/my.cnf.d/client.cnf
+%endif
+
+%if %{without connect}
+rm -f %{buildroot}%{_sysconfdir}/my.cnf.d/connect.cnf
%endif
%if %{without config}
@@ -976,7 +996,6 @@ fi
%{_mandir}/man1/aria_read_log.1.gz
%config(noreplace) %{_sysconfdir}/my.cnf.d/client.cnf
-%config(noreplace) %{_sysconfdir}/my.cnf.d/connect.cnf
%endif
%if %{with clibrary}
@@ -1083,6 +1102,7 @@ fi
%{_libdir}/mysql/plugin
%{?with_oqgraph:%exclude %{_libdir}/mysql/plugin/ha_oqgraph.so}
+%{?with_connect:%exclude %{_libdir}/mysql/plugin/ha_connect.so}
%exclude %{_libdir}/mysql/plugin/dialog.so
%exclude %{_libdir}/mysql/plugin/mysql_clear_password.so
@@ -1149,11 +1169,17 @@ fi
%config(noreplace) %{logrotateddir}/%{daemon_name}
%if %{with oqgraph}
-%files oqgraph
+%files oqgraph-engine
%config(noreplace) %{_sysconfdir}/my.cnf.d/oqgraph.cnf
%{_libdir}/mysql/plugin/ha_oqgraph.so
%endif
+%if %{with connect}
+%files connect-engine
+%config(noreplace) %{_sysconfdir}/my.cnf.d/connect.cnf
+%{_libdir}/mysql/plugin/ha_connect.so
+%endif
+
%if %{with devel}
%files devel
%{_bindir}/mysql_config
@@ -1196,6 +1222,8 @@ fi
Related: #1096787
- Client related libraries moved from mariadb-server to mariadb-libs
Related: #1138843
+- Move connect engine to a separate package
+ Rename oqgraph engine to align with upstream packages
* Mon Sep 08 2014 Honza Horak <hhorak at redhat.com> - 1:10.0.13-1
- Rebase to version 10.0.13
More information about the scm-commits
mailing list