From 0f3a84d4ce867f3b88ad4224f1b963c5e7aac361 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Thu, 25 Jan 2024 14:58:41 +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 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mariadb.spec b/mariadb.spec index f4164b3..5d2c347 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -1059,6 +1059,10 @@ 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 +rm %{buildroot}%{_unitdir}/%{daemon_name}*.socket + # Disable plugins %if %{with gssapi} sed -i 's/^plugin-load-add/#plugin-load-add/' %{buildroot}%{_sysconfdir}/my.cnf.d/auth_gssapi.cnf @@ -1502,6 +1506,7 @@ fi %{_datadir}/%{pkg_name}/policy/selinux/mariadb-server.* %{_datadir}/%{pkg_name}/policy/selinux/mariadb.* %{_datadir}/%{pkg_name}/systemd/mariadb.service +%{_datadir}/%{pkg_name}/systemd/mariadb*@.socket # mariadb@ is installed only when we have cmake newer than 3.3 %if 0%{?fedora} || 0%{?rhel} > 7 %{_datadir}/%{pkg_name}/systemd/mariadb@.service