From da0686f48a77cb29c3b01a7ddcaa360188a8d501 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Thu, 25 Apr 2024 18:08:42 +0200 Subject: [PATCH] - keep common dirs for mysqlrouter in mysql-common, fix /var/{lib,log} dirs --- mysql.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mysql.spec b/mysql.spec index 32e2afe..8c922d1 100644 --- a/mysql.spec +++ b/mysql.spec @@ -562,7 +562,7 @@ CPPFLAGS="%{rpmcppflags}" \ %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/etc/{ld.so.conf.d,logrotate.d,rc.d/init.d,sysconfig,mysql/%{mysqlversion},skel} \ - $RPM_BUILD_ROOT/var/{lib/mysqlrouter,log/{archive,}/{mysql,mysqlrouter}/%{mysqlversion},lib/{mysql,mysql-files}/%{mysqlversion}} \ + $RPM_BUILD_ROOT/var/{log/{archive,}/{mysql,mysqlrouter}/%{mysqlversion},lib/{mysql,mysql-files,mysqlrouter}/%{mysqlversion}} \ $RPM_BUILD_ROOT%{_libdir} %{__make} -C build install \ @@ -1112,8 +1112,11 @@ fi %dir %{_datadir}/mysql %attr(751,root,root) %dir /var/lib/mysql %attr(751,root,root) %dir /var/lib/mysql-files +%attr(751,root,root) %dir /var/lib/mysqlrouter %attr(751,root,root) %dir /var/log/mysql %attr(751,root,root) %dir /var/log/archive/mysql +%attr(751,root,root) %dir /var/log/mysqlrouter +%attr(751,root,root) %dir /var/log/archive/mysqlrouter %files dirs %defattr(644,root,root,755) @@ -1264,6 +1267,7 @@ fi %{_sysconfdir}/ld.so.conf.d/%{name}-router.conf %dir %{_libdir}/mysql/%{mysqlversion}/router %dir %{_libdir}/mysql/%{mysqlversion}/router/private +%attr(750,root,root) %dir /var/lib/mysqlrouter/%{mysqlversion} %attr(755,root,root) %{_libdir}/mysql/%{mysqlversion}/bin/mysqlrouter %attr(755,root,root) %{_libdir}/mysql/%{mysqlversion}/bin/mysqlrouter_keyring %attr(755,root,root) %{_libdir}/mysql/%{mysqlversion}/bin/mysqlrouter_passwd @@ -1289,8 +1293,6 @@ fi %{_datadir}/mysql/%{mysqlversion}/man/man1/mysqlrouter.1* %{_datadir}/mysql/%{mysqlversion}/man/man1/mysqlrouter_passwd.1* %{_datadir}/mysql/%{mysqlversion}/man/man1/mysqlrouter_plugin_info.1* -%attr(751,root,root) %dir /var/lib/mysqlrouter -%attr(751,root,root) %dir /var/log/mysqlrouter %attr(750,mysqlrouter,mysqlrouter) %dir /var/log/mysqlrouter/%{mysqlversion} %attr(750,mysqlrouter,mysqlrouter) %dir /var/log/archive/mysqlrouter/%{mysqlversion} %attr(640,mysql,mysql) %ghost /var/log/mysqlrouter/%{mysqlversion}/* -- 2.46.0