rpm/mariadb
SHA256
1
0
Fork 0
forked from pool/mariadb
Code Pull Requests Activity

Accepting request 852692 from home:darix:washere

Browse Source 
- switch to bcond_with to make it easier to enable galera support
  via the prjconfig
- fix non galera case for building

OBS-URL: https://build.opensuse.org/request/show/852692
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=262
This commit is contained in:
Adam Majer 2020-12-21 12:14:01 +00:00 committed by Git OBS Bridge
parent a5a87c1e70
commit 9bbe391c1f
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mariadb.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Dec 2 17:27:43 UTC 2020 - Marcus Rueckert <mrueckert@suse.de>
- switch to bcond_with to make it easier to enable galera support
via the prjconfig
- fix non galera case for building
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 12 14:57:52 UTC 2020 - Kristyna Streitova <kstreitova@suse.com> Thu Nov 12 14:57:52 UTC 2020 - Kristyna Streitova <kstreitova@suse.com>

19
mariadb.spec
View File

@ -43,9 +43,9 @@
%define with_rocksdb 0 %define with_rocksdb 0
%endif %endif
%if 0%{?is_opensuse} %if 0%{?is_opensuse}
%define with_galera 1 %bcond_without galera
%else %else
%define with_galera 0 %bcond_with galera
%endif %endif
# Define python interpreter version # Define python interpreter version
%if 0%{?suse_version} >= 1500 %if 0%{?suse_version} >= 1500
@ -247,7 +247,7 @@ Obsoletes: mysql-client < %{version}
%description client %description client
This package contains the standard clients for MariaDB. This package contains the standard clients for MariaDB.
%if 0%{with_galera} > 0 %if %{with galera}
%package galera %package galera
Summary: The configuration files and scripts for galera replication Summary: The configuration files and scripts for galera replication
Group: Productivity/Databases/Tools Group: Productivity/Databases/Tools
@ -454,7 +454,7 @@ export CXXFLAGS="$CFLAGS -felide-constructors"
-DWITH_HANDLERSOCKET_STORAGE_ENGINE=1 \ -DWITH_HANDLERSOCKET_STORAGE_ENGINE=1 \
-DWITH_INNODB_MEMCACHED=ON \ -DWITH_INNODB_MEMCACHED=ON \
-DWITH_EMBEDDED_SERVER=true \ -DWITH_EMBEDDED_SERVER=true \
%if 0%{with_galera} > 0 %if %{with galera}
-DWITH_WSREP=ON \ -DWITH_WSREP=ON \
-DWITH_INNODB_DISALLOW_WRITES=1 \ -DWITH_INNODB_DISALLOW_WRITES=1 \
%endif %endif
@ -596,7 +596,7 @@ if [ -f scripts/mysqlaccess.conf ] ; then
echo '%config(noreplace) %attr(0640, root, mysql) %{_sysconfdir}/mysqlaccess.conf' >> mariadb-client.files echo '%config(noreplace) %attr(0640, root, mysql) %{_sysconfdir}/mysqlaccess.conf' >> mariadb-client.files
fi fi
%if 0%{with_galera} > 0 %if %{with galera}
# mariadb-galera.files # mariadb-galera.files
filelist galera_new_cluster galera_recovery wsrep_sst_common wsrep_sst_mariabackup wsrep_sst_mysqldump wsrep_sst_rsync wsrep_sst_rsync_wan >mariadb-galera.files filelist galera_new_cluster galera_recovery wsrep_sst_common wsrep_sst_mariabackup wsrep_sst_mysqldump wsrep_sst_rsync wsrep_sst_rsync_wan >mariadb-galera.files
%endif %endif
@ -684,7 +684,7 @@ ln -s mysqlcheck '%{buildroot}'%{_bindir}/mysqloptimize
rm -rf '%{buildroot}'%{_sysconfdir}/my.cnf.d rm -rf '%{buildroot}'%{_sysconfdir}/my.cnf.d
install -d -m 755 '%{buildroot}'%{_sysconfdir}/my.cnf.d install -d -m 755 '%{buildroot}'%{_sysconfdir}/my.cnf.d
%if 0%{with_galera} > 0 %if %{with galera}
# Install galera config file and script # Install galera config file and script
install -p -m 644 build/support-files/wsrep.cnf %{buildroot}%{_sysconfdir}/my.cnf.d/50-galera.cnf install -p -m 644 build/support-files/wsrep.cnf %{buildroot}%{_sysconfdir}/my.cnf.d/50-galera.cnf
install -p -m 755 build/scripts/galera_new_cluster %{buildroot}%{_bindir}/galera_new_cluster install -p -m 755 build/scripts/galera_new_cluster %{buildroot}%{_bindir}/galera_new_cluster
@ -824,9 +824,10 @@ exit 0
%files -f mariadb.files %files -f mariadb.files
%config(noreplace) %attr(0644, root, mysql) %{_sysconfdir}/my.cnf %config(noreplace) %attr(0644, root, mysql) %{_sysconfdir}/my.cnf
%dir %attr(0755, root, mysql) %{_sysconfdir}/my.cnf.d %config(noreplace) %attr(0755, root, mysql, 0644) %{_sysconfdir}/my.cnf.d/
%config(noreplace) %attr(0644, root, mysql) %{_sysconfdir}/my.cnf.d/* %if %{with galera}
%exclude %{_sysconfdir}/my.cnf.d/50-galera.cnf %exclude %{_sysconfdir}/my.cnf.d/50-galera.cnf
%endif
%config(noreplace) %{_sysconfdir}/security/user_map.conf %config(noreplace) %{_sysconfdir}/security/user_map.conf
%config %{_sysconfdir}/logrotate.d/%{name} %config %{_sysconfdir}/logrotate.d/%{name}
%doc %{_defaultdocdir}/%{name} %doc %{_defaultdocdir}/%{name}
@ -897,7 +898,7 @@ exit 0
%{_libdir}/mysql/plugin/dialog_examples.so %{_libdir}/mysql/plugin/dialog_examples.so
%{_sysusersdir}/mysql-user.conf %{_sysusersdir}/mysql-user.conf
%if 0%{with_galera} > 0 %if %{with galera}
%files galera -f mariadb-galera.files %files galera -f mariadb-galera.files
%doc Docs/README.wsrep %doc Docs/README.wsrep
%config(noreplace) %{_sysconfdir}/my.cnf.d/50-galera.cnf %config(noreplace) %{_sysconfdir}/my.cnf.d/50-galera.cnf