From f0d12b9786d4d17f9a6e4bbd5ffa0edb223500df Mon Sep 17 00:00:00 2001
From: Michal Schorm <mschorm@redhat.com>
Date: Mon, 10 Jun 2024 09:00:25 +0200
Subject: [PATCH] [SPECfile fixup] Move bits regarding clustercheck around the
 SPECfile, so they are only used when galera sub-package is built

Build should now work correctly for both variants:
  %bcond_without galera
  %bcond_with galera

wsrep and clustercheck bits are meant to only be packed fi galera sub-package is being built
---
 mariadb10.11.spec | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/mariadb10.11.spec b/mariadb10.11.spec
index 5fb7c48..ad6edc6 100644
--- a/mariadb10.11.spec
+++ b/mariadb10.11.spec
@@ -1090,13 +1090,19 @@ ln -s %{_libexecdir}/mariadbd %{buildroot}%{_sbindir}/mariadbd
 # copy additional docs into build tree so %%doc will find them
 install -p -m 0644 %{SOURCE6} %{basename:%{SOURCE6}}
 install -p -m 0644 %{SOURCE16} %{basename:%{SOURCE16}}
-install -p -m 0644 %{SOURCE71} %{basename:%{SOURCE71}}
 
 %if %{with galera}
 # Add wsrep_sst_rsync_tunnel script
 install -p -m 0755 scripts/wsrep_sst_rsync_tunnel %{buildroot}%{_bindir}/wsrep_sst_rsync_tunnel
 install -p -m 0644 %{SOURCE8} %{basename:%{SOURCE8}}
 
+# install the clustercheck script
+mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
+touch %{buildroot}%{_sysconfdir}/sysconfig/clustercheck
+install -p -m 0755 %{_vpath_builddir}/scripts/clustercheck %{buildroot}%{_bindir}/clustercheck
+# clustercheck license
+install -p -m 0644 %{SOURCE71} %{basename:%{SOURCE71}}
+
 # install galera config file
 sed -i -r 's|^wsrep_provider=none|wsrep_provider=%{_libdir}/galera/libgalera_smm.so|' %{_vpath_builddir}/support-files/wsrep.cnf
 install -p -m 0644 %{_vpath_builddir}/support-files/wsrep.cnf %{buildroot}%{_sysconfdir}/my.cnf.d/galera.cnf
@@ -1108,18 +1114,8 @@ install -p -m 644 -D selinux/%{majorname}-server-galera.pp %{buildroot}%{_datadi
 #   The replication requires cluster address upon startup (which is end-user specific).
 #   Disable it entirely, rather than have it failing out-of-the-box.
 sed -i 's/^wsrep_on=1/wsrep_on=0/' %{buildroot}%{_sysconfdir}/my.cnf.d/galera.cnf
-%else
-rm %{buildroot}%{_sysconfdir}/sysconfig/clustercheck
-rm %{buildroot}%{_bindir}/{clustercheck,galera_new_cluster}
-rm %{buildroot}%{_bindir}/galera_recovery
 %endif
 
-
-# install the clustercheck script
-mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
-touch %{buildroot}%{_sysconfdir}/sysconfig/clustercheck
-install -p -m 0755 %{_vpath_builddir}/scripts/clustercheck %{buildroot}%{_bindir}/clustercheck
-
 # remove duplicate logrotate script
 rm %{buildroot}%{_datadir}/mariadb/mariadb.logrotate
 # Remove AppArmor files
@@ -1460,6 +1456,8 @@ fi
 %{_bindir}/clustercheck
 %{_bindir}/galera_new_cluster
 %{_bindir}/galera_recovery
+%{_mandir}/man1/galera_new_cluster.1*
+%{_mandir}/man1/galera_recovery.1*
 %config(noreplace) %{_sysconfdir}/my.cnf.d/galera.cnf
 %attr(0640,root,root) %ghost %config(noreplace) %{_sysconfdir}/sysconfig/clustercheck
 %{_datadir}/selinux/packages/targeted/%{majorname}-server-galera.pp
@@ -1489,6 +1487,7 @@ fi
 %if %{with galera}
 # wsrep_sst_common should be moved to /usr/share/mariadb: https://jira.mariadb.org/browse/MDEV-14296
 %{_bindir}/wsrep_*
+%{_mandir}/man1/wsrep_*.1*
 %doc README.wsrep_sst_rsync_tunnel
 %endif
 
@@ -1533,8 +1532,6 @@ fi
 %exclude %{_libdir}/%{majorname}/plugin/auth_pam_tool_dir/auth_pam_tool
 
 %{_mandir}/man1/aria_{chk,dump_log,ftdump,pack,read_log}.1*
-%{_mandir}/man1/galera_new_cluster.1*
-%{_mandir}/man1/galera_recovery.1*
 %{_mandir}/man1/mariadb-service-convert.1*
 %{_mandir}/man1/myisamchk.1*
 %{_mandir}/man1/myisamlog.1*
@@ -1554,7 +1551,6 @@ fi
 %{_mandir}/man1/resolveip.1*
 %{_mandir}/man1/resolve_stack_dump.1*
 %{_mandir}/man8/{mysqld,mariadbd}.8*
-%{_mandir}/man1/wsrep_*.1*
 
 %{_mandir}/man1/mysql.server.1*
 
@@ -1584,8 +1580,8 @@ fi
 %endif
 %if %{with galera}
 %{_datadir}/%{majorname}/wsrep.cnf
-%endif
 %{_datadir}/%{majorname}/wsrep_notify
+%endif
 %dir %{_datadir}/%{majorname}/policy
 %dir %{_datadir}/%{majorname}/policy/selinux
 %{_datadir}/%{majorname}/policy/selinux/README