[packaging enhancement] Moved the 'mariadb-convert-table-format'

and 'mysql_convert_table_format' utils form the '-server-utils' sub-package
into the '-client-utils' sub-package because they are written to communicate
with the server part of the package through a client interface.

This change was inspired by the way the Fedora 41 and RHEL 9
RPMs provided by the MariaDB upstream are packaged.

More info on the util:
https://mariadb.com/kb/en/mariadb-convert-table-format/
This commit is contained in:
Pavol Sloboda 2025-06-02 08:20:09 +00:00 committed by Michal Schorm
parent 6ed9d8c35c
commit 74ea0b38be

View File

@ -1254,14 +1254,14 @@ unlink %{buildroot}%{_libdir}/libmysqlclient_r.so
rm %{buildroot}%{_bindir}/msql2mysql
rm %{buildroot}%{_bindir}/my_print_defaults
rm %{buildroot}%{_bindir}/{mysql,mariadb}
rm %{buildroot}%{_bindir}/mysql{access,admin,binlog,check,dump,_find_rows,import,_plugin,show,slap,_tzinfo_to_sql,_waitpid}
rm %{buildroot}%{_bindir}/mariadb-{access,admin,binlog,check,dump,find-rows,import,plugin,show,slap,tzinfo-to-sql,waitpid}
rm %{buildroot}%{_bindir}/mysql{access,admin,binlog,check,_convert_table_format,dump,_find_rows,import,_plugin,show,slap,_tzinfo_to_sql,_waitpid}
rm %{buildroot}%{_bindir}/mariadb-{access,admin,binlog,check,convert-table-format,dump,find-rows,import,plugin,show,slap,tzinfo-to-sql,waitpid}
rm %{buildroot}%{_mandir}/man1/msql2mysql.1*
rm %{buildroot}%{_mandir}/man1/my_print_defaults.1*
rm %{buildroot}%{_mandir}/man1/{mysql,mariadb}.1*
rm %{buildroot}%{_mandir}/man1/mysql{access,admin,binlog,check,dump,_find_rows,import,_plugin,show,slap,_tzinfo_to_sql,_waitpid}.1*
rm %{buildroot}%{_mandir}/man1/mariadb-{access,admin,binlog,check,dump,find-rows,import,plugin,show,slap,tzinfo-to-sql,waitpid}.1*
rm %{buildroot}%{_mandir}/man1/mysql{access,admin,binlog,check,_convert_table_format,dump,_find_rows,import,_plugin,show,slap,_tzinfo_to_sql,_waitpid}.1*
rm %{buildroot}%{_mandir}/man1/mariadb-{access,admin,binlog,check,convert-table-format,dump,find-rows,import,plugin,show,slap,tzinfo-to-sql,waitpid}.1*
rm %{buildroot}%{_sysconfdir}/my.cnf.d/mysql-clients.cnf
%endif
@ -1452,10 +1452,10 @@ fi
%config(noreplace) %{_sysconfdir}/my.cnf.d/mysql-clients.cnf
%files -n %{pkgname}-client-utils
%{_bindir}/mysql{access,_find_rows}
%{_bindir}/mariadb-{access,find-rows}
%{_mandir}/man1/mysql{access,_find_rows}.1*
%{_mandir}/man1/mariadb-{access,find-rows}.1*
%{_bindir}/mysql{access,_convert_table_format,_find_rows}
%{_bindir}/mariadb-{access,convert-table-format,find-rows}
%{_mandir}/man1/mysql{access,_convert_table_format,_find_rows}.1*
%{_mandir}/man1/mariadb-{access,convert-table-format,find-rows}.1*
%endif
%if %{with clibrary}
@ -1736,12 +1736,12 @@ fi
%files -n %{pkgname}-server-utils
# Perl utilities
%{_bindir}/mysql{_convert_table_format,dumpslow,_fix_extensions,hotcopy,_setpermission}
%{_bindir}/mariadb-{convert-table-format,dumpslow,fix-extensions,hotcopy,setpermission}
%{_bindir}/mysql{dumpslow,_fix_extensions,hotcopy,_setpermission}
%{_bindir}/mariadb-{dumpslow,fix-extensions,hotcopy,setpermission}
%{_bindir}/{mysqld_,mariadbd-}multi
%{_mandir}/man1/mysql{_convert_table_format,dumpslow,_fix_extensions,hotcopy,_setpermission}.1*
%{_mandir}/man1/mariadb-{convert-table-format,dumpslow,fix-extensions,hotcopy,setpermission}.1*
%{_mandir}/man1/mysql{dumpslow,_fix_extensions,hotcopy,_setpermission}.1*
%{_mandir}/man1/mariadb-{dumpslow,fix-extensions,hotcopy,setpermission}.1*
%{_mandir}/man1/{mysqld_,mariadbd-}multi.1*
%if %{with devel}