[mariadb-galera/f21] Fix build directories def and usage

Honza Horak hhorak at fedoraproject.org
Sun Jan 25 14:22:29 UTC 2015 

commit 47220b5473185590655248d62d82334b49b20398
Author: Honza Horak <hhorak at redhat.com>
Date:   Sun Jan 25 09:12:02 2015 +0100

    Fix build directories def and usage
    
    Conflicts:
    	mariadb-galera.spec

 mariadb-galera.spec |   95 ++++++++++++++++++++++++++++-----------------------
 1 files changed, 52 insertions(+), 43 deletions(-)
---
diff --git a/mariadb-galera.spec b/mariadb-galera.spec
index 97ac7f8..8a9d10a 100644
--- a/mariadb-galera.spec
+++ b/mariadb-galera.spec
@@ -22,6 +22,10 @@
 # Disabled for galera since only InnoDB works there
 %bcond_with tokudb
 
+# Mroonga engine is now part of MariaDB, but it only builds for x86_64;
+# variable mroonga allows to build with Mroonga storage engine
+%bcond_with mroonga
+
 # The Open Query GRAPH engine (OQGRAPH) is a computation engine allowing
 # hierarchies and more complex graph structures to be handled in a relational
 # fashion; enabled by default
@@ -50,11 +54,13 @@
 %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
 %bcond_without init_systemd
 %bcond_with init_sysv
-%global daemon_name mariadb
+%global daemon_name %{name}
+%global daemondir %{_unitdir}
 %else
 %bcond_with init_systemd
 %bcond_without init_sysv
 %global daemon_name mysqld
+%global daemondir %{_sysconfdir}/rc.d/init.d
 %endif
 
 # MariaDB 10.0 and later requires pcre >= 8.35, otherwise we need to use
@@ -633,7 +639,7 @@ export LDFLAGS
          -DINSTALL_INFODIR=share/info \
          -DINSTALL_LIBDIR="%{_lib}/mysql" \
          -DINSTALL_MANDIR=share/man \
-         -DINSTALL_MYSQLSHAREDIR=share/%{datadirname} \
+         -DINSTALL_MYSQLSHAREDIR=share/%{pkgname} \
          -DINSTALL_MYSQLTESTDIR=share/mysql-test \
          -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \
          -DINSTALL_SBINDIR=libexec \
@@ -650,6 +656,7 @@ export LDFLAGS
 %{?with_pcre: -DWITH_PCRE=system}\
          -DWITH_JEMALLOC=no \
 %{!?with_tokudb: -DWITHOUT_TOKUDB=ON}\
+%{!?with_mroonga: -DWITHOUT_MROONGA=ON}\
          -DTMPDIR=/var/tmp \
 %{?with_debug: -DCMAKE_BUILD_TYPE=Debug}\
          %{?_hardened_build:-DWITH_MYSQLD_LDFLAGS="-pie -Wl,-z,relro,-z,now"}
@@ -697,8 +704,8 @@ install -p -m 0755 scripts/mysql_config_multilib %{buildroot}%{_bindir}/mysql_co
 
 # install INFO_SRC, INFO_BIN into libdir (upstream thinks these are doc files,
 # but that's pretty wacko --- see also %%{name}-file-contents.patch)
-mv %{buildroot}%{_pkgdocdir}/MariaDB-Galera-server-%{version}/INFO_SRC %{buildroot}%{_libdir}/mysql/
-mv %{buildroot}%{_pkgdocdir}/MariaDB-Galera-server-%{version}/INFO_BIN %{buildroot}%{_libdir}/mysql/
+install -p -m 644 Docs/INFO_SRC %{buildroot}%{_libdir}/mysql/
+install -p -m 644 Docs/INFO_BIN %{buildroot}%{_libdir}/mysql/
 rm -rf %{buildroot}%{_pkgdocdir}/MariaDB-Galera-server-%{version}/
 
 mkdir -p %{buildroot}%{logfiledir}
@@ -724,7 +731,7 @@ rm -f %{buildroot}%{_sysconfdir}/my.cnf
 
 # install systemd unit files and scripts for handling server startup
 %if %{with init_systemd}
-install -D -p -m 644 scripts/mysql.service %{buildroot}%{_unitdir}/%{daemon_name}.service
+install -D -p -m 644 scripts/mysql.service %{buildroot}%{daemondir}/%{daemon_name}.service
 install -D -p -m 0644 scripts/mysql.tmpfiles.d %{buildroot}%{_tmpfilesdir}/%{name}.conf
 %endif
 
@@ -854,12 +861,12 @@ rm -f %{buildroot}%{_sysconfdir}/my.cnf.d/mysql-clients.cnf
 %endif
 
 %if %{without common}
-rm -rf %{buildroot}%{_datadir}/%{datadirname}/charsets
+rm -rf %{buildroot}%{_datadir}/%{pkgname}/charsets
 %endif
 
 %if %{without errmsg}
-rm -f %{buildroot}%{_datadir}/%{datadirname}/errmsg-utf8.txt
-rm -rf %{buildroot}%{_datadir}/%{datadirname}/{english,czech,danish,dutch,estonian,\
+rm -f %{buildroot}%{_datadir}/%{pkgname}/errmsg-utf8.txt
+rm -rf %{buildroot}%{_datadir}/%{pkgname}/{english,czech,danish,dutch,estonian,\
 french,german,greek,hungarian,italian,japanese,korean,norwegian,norwegian-ny,\
 polish,portuguese,romanian,russian,serbian,slovak,spanish,swedish,ukrainian}
 %endif
@@ -1042,36 +1049,37 @@ fi
 %files common
 %doc README COPYING COPYING.LESSER README.mysql-license
 %doc storage/innobase/COPYING.Percona storage/innobase/COPYING.Google
-%dir %{_datadir}/%{datadirname}
-%{_datadir}/%{datadirname}/charsets
+%dir %{_libdir}/mysql
+%dir %{_datadir}/%{pkgname}
+%{_datadir}/%{pkgname}/charsets
 %endif
 
 %if %{with errmsg}
 %files errmsg
-%{_datadir}/%{datadirname}/errmsg-utf8.txt
-%{_datadir}/%{datadirname}/english
-%lang(cs) %{_datadir}/%{datadirname}/czech
-%lang(da) %{_datadir}/%{datadirname}/danish
-%lang(nl) %{_datadir}/%{datadirname}/dutch
-%lang(et) %{_datadir}/%{datadirname}/estonian
-%lang(fr) %{_datadir}/%{datadirname}/french
-%lang(de) %{_datadir}/%{datadirname}/german
-%lang(el) %{_datadir}/%{datadirname}/greek
-%lang(hu) %{_datadir}/%{datadirname}/hungarian
-%lang(it) %{_datadir}/%{datadirname}/italian
-%lang(ja) %{_datadir}/%{datadirname}/japanese
-%lang(ko) %{_datadir}/%{datadirname}/korean
-%lang(no) %{_datadir}/%{datadirname}/norwegian
-%lang(no) %{_datadir}/%{datadirname}/norwegian-ny
-%lang(pl) %{_datadir}/%{datadirname}/polish
-%lang(pt) %{_datadir}/%{datadirname}/portuguese
-%lang(ro) %{_datadir}/%{datadirname}/romanian
-%lang(ru) %{_datadir}/%{datadirname}/russian
-%lang(sr) %{_datadir}/%{datadirname}/serbian
-%lang(sk) %{_datadir}/%{datadirname}/slovak
-%lang(es) %{_datadir}/%{datadirname}/spanish
-%lang(sv) %{_datadir}/%{datadirname}/swedish
-%lang(uk) %{_datadir}/%{datadirname}/ukrainian
+%{_datadir}/%{pkgname}/errmsg-utf8.txt
+%{_datadir}/%{pkgname}/english
+%lang(cs) %{_datadir}/%{pkgname}/czech
+%lang(da) %{_datadir}/%{pkgname}/danish
+%lang(nl) %{_datadir}/%{pkgname}/dutch
+%lang(et) %{_datadir}/%{pkgname}/estonian
+%lang(fr) %{_datadir}/%{pkgname}/french
+%lang(de) %{_datadir}/%{pkgname}/german
+%lang(el) %{_datadir}/%{pkgname}/greek
+%lang(hu) %{_datadir}/%{pkgname}/hungarian
+%lang(it) %{_datadir}/%{pkgname}/italian
+%lang(ja) %{_datadir}/%{pkgname}/japanese
+%lang(ko) %{_datadir}/%{pkgname}/korean
+%lang(no) %{_datadir}/%{pkgname}/norwegian
+%lang(no) %{_datadir}/%{pkgname}/norwegian-ny
+%lang(pl) %{_datadir}/%{pkgname}/polish
+%lang(pt) %{_datadir}/%{pkgname}/portuguese
+%lang(ro) %{_datadir}/%{pkgname}/romanian
+%lang(ru) %{_datadir}/%{pkgname}/russian
+%lang(sr) %{_datadir}/%{pkgname}/serbian
+%lang(sk) %{_datadir}/%{pkgname}/slovak
+%lang(es) %{_datadir}/%{pkgname}/spanish
+%lang(sv) %{_datadir}/%{pkgname}/swedish
+%lang(uk) %{_datadir}/%{pkgname}/ukrainian
 %endif
 
 %files server
@@ -1125,7 +1133,7 @@ fi
 %{_libdir}/mysql/INFO_SRC
 %{_libdir}/mysql/INFO_BIN
 %if %{without common}
-%dir %{_datadir}/%{datadirname}
+%dir %{_datadir}/%{pkgname}
 %endif
 
 %{_libdir}/mysql/plugin
@@ -1165,20 +1173,21 @@ fi
 %{_mandir}/man1/mysql_tzinfo_to_sql.1*
 %{_mandir}/man8/mysqld.8*
 
-%{_datadir}/%{datadirname}/fill_help_tables.sql
-%{_datadir}/%{datadirname}/install_spider.sql
-%{_datadir}/%{datadirname}/mysql_system_tables.sql
-%{_datadir}/%{datadirname}/mysql_system_tables_data.sql
-%{_datadir}/%{datadirname}/mysql_test_data_timezone.sql
-%{_datadir}/%{datadirname}/mysql_performance_tables.sql
+%{_datadir}/%{pkgname}/fill_help_tables.sql
+%{_datadir}/%{pkgname}/install_spider.sql
+%{_datadir}/%{pkgname}/mysql_system_tables.sql
+%{_datadir}/%{pkgname}/mysql_system_tables_data.sql
+%{_datadir}/%{pkgname}/mysql_test_data_timezone.sql
+%{_datadir}/%{pkgname}/mysql_performance_tables.sql
+%{?with_mroonga:%{_datadir}/%{pkgname}/mroonga/install.sql}
+%{?with_mroonga:%{_datadir}/%{pkgname}/mroonga/uninstall.sql}
 %{_datadir}/%{name}/my-*.cnf
 %{_datadir}/%{name}/wsrep.cnf
 %{_datadir}/%{name}/wsrep_notify
 
 %{?mysqld_unit:%{_unitdir}/%{mysqld_unit}.service}
 %{?mysqld_unit:%{_unitdir}/%{daemon_name}.service.d/mysql-compat.conf}
-%{?with_init_systemd:%{_unitdir}/%{daemon_name}.service}
-%{?with_init_sysv:%{_initddir}/%{daemon_name}}
+%{daemondir}/%{daemon_name}*
 %{_libexecdir}/mysql-prepare-db-dir
 %{_libexecdir}/mysql-wait-ready
 %{_libexecdir}/mysql-check-socket

More information about the scm-commits mailing list