From 347c8546b3fbb52651263b1199f02334546e9689 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Fri, 26 Jan 2024 11:59:42 +0100 Subject: [PATCH] MariaDB ship systemd socket files since 10.6 https://mariadb.com/kb/en/systemd/#systemd-socket-activation In case of RHEL, ship them in %_datadir, instead of the %_unitdir, so users can still try them out, but it is not a default configuration. --- mariadb.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mariadb.spec b/mariadb.spec index f722a9d..fce2019 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -1073,6 +1073,11 @@ mv %{buildroot}/%{_lib}/security %{buildroot}%{_libdir} # Add wsrep_sst_rsync_tunnel script install -p -m 0755 scripts/wsrep_sst_rsync_tunnel %{buildroot}%{_bindir}/wsrep_sst_rsync_tunnel +# Remove systemd socket files from %%{_unitdir} +# We ship them in %%{_datadir}, so users can try them out on their own risk +mkdir -p %{buildroot}%{_datadir}/%{daemon_name}/systemd +mv %{buildroot}%{_unitdir}/%{daemon_name}*.socket %{buildroot}%{_datadir}/%{daemon_name}/systemd + # Disable plugins %if %{with gssapi} sed -i 's/^plugin-load-add/#plugin-load-add/' %{buildroot}%{_sysconfdir}/my.cnf.d/auth_gssapi.cnf @@ -1524,6 +1529,8 @@ fi %{_datadir}/%{pkg_name}/policy/selinux/README %{_datadir}/%{pkg_name}/policy/selinux/mariadb-server.* %{_datadir}/%{pkg_name}/policy/selinux/mariadb.* +%dir %{_datadir}/%{pkg_name}/systemd +%{_datadir}/%{pkg_name}/systemd/*.socket %{_unitdir}/%{daemon_name}*