Revert "For compatibility with upstream RPMs, create symlinks to "mysql*" named systemd services"

This reverts commit 7c52598552.

Wee need to discuss this further.
This commit is contained in:
Michal Schorm 2021-02-02 16:07:12 +01:00
parent a475c7ef2f
commit 153eaac4b2
1 changed files with 2 additions and 11 deletions

View File

@ -154,7 +154,7 @@
Name: mariadb
Version: 10.5.8
Release: 5%{?with_debug:.debug}%{?dist}
Release: 4%{?with_debug:.debug}%{?dist}
Epoch: 3
Summary: A very fast and robust SQL database server
@ -1031,11 +1031,7 @@ install -p -m 0644 %{SOURCE71} %{basename:%{SOURCE71}}
# We don't use this location of service files
rm %{buildroot}%{_datadir}/%{pkg_name}/systemd/{mysql,mysqld}.service
# These may come handy in a future, but right now we use our own services
rm %{buildroot}%{_unitdir}/{mysql,mysqld}.service
# For compatibility with upstream RPMs, create symlinks to "mysql*" named systemd services
ln -s %{_unitdir}/mariadb.service %{buildroot}%{_unitdir}/mysql.service
ln -s %{_unitdir}/mariadb.service %{buildroot}%{_unitdir}/mysqld.service
rm %{buildroot}/usr/lib/systemd/system/{mysql,mysqld}.service
# install galera config file
%if %{with galera}
@ -1496,8 +1492,6 @@ fi
%endif
%{_unitdir}/%{daemon_name}*
%{_unitdir}/mysql.service
%{_unitdir}/mysqld.service
%{?with_tokudb:%exclude %{_unitdir}/mariadb.service.d/tokudb.conf}
%{_libexecdir}/mysql-prepare-db-dir
@ -1635,9 +1629,6 @@ fi
%endif
%changelog
* Sun Jan 31 2021 Michal Schorm <hhorak@redhat.com> - 3:10.5.8-5
- For compatibility with upstream RPMs, create symlinks to "mysql*" named systemd services
* Thu Jan 28 2021 Honza Horak <hhorak@redhat.com> - 3:10.5.8-4
- For compatibility with upstream RPMs, create mysqld symlink in sbin