rpms/mariadb11.8
7
0
Fork 0
Code Issues Pull Requests Releases Activity

[packaging enhancement] Moved the '.so' and '.ini' files used specifically

Browse Source 
for testing from the '-server' sub-package to the '-test' sub-package
Also added the '%{_libdir}/%{majorname}/plugin' directory to the
%files section of the '-test' sub-package to ensure that the directory
does not become unowned if only the '-test' sub-package is installed
without the '-server' subpackage.

We don't need the excludes anymore aince we stopped using glob for the
plugin directory.

This change was inspired by the way the Fedora 41 and RHEL 9
RPMs provided by the MariaDB upstream are packaged.
This commit is contained in:
Pavol Sloboda 2025-06-02 13:16:30 +02:00 committed by Michal Schorm
parent 61ec4a36a2
commit 6cdc4a90cc
1 changed files with 66 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
mariadb10.11.spec
View File

@ -1299,6 +1299,25 @@ rm %{buildroot}%{_bindir}/{mariadb-client-test,mariadb-test}
rm %{buildroot}%{_mandir}/man1/{mysql_client_test,mysqltest,my_safe_process}.1*
rm %{buildroot}%{_mandir}/man1/{mariadb-client-test,mariadb-test}.1*
rm %{buildroot}%{_mandir}/man1/{mysql-test-run,mysql-stress-test}.pl.1*
rm %{buildroot}%{_libdir}/%{majorname}/plugin/adt_null.so
rm %{buildroot}%{_libdir}/%{majorname}/plugin/auth_0x0100.so
rm %{buildroot}%{_libdir}/%{majorname}/plugin/auth_test_plugin.so
rm %{buildroot}%{_libdir}/%{majorname}/plugin/debug_key_management.so
rm %{buildroot}%{_libdir}/%{majorname}/plugin/dialog_examples.so
rm %{buildroot}%{_libdir}/%{majorname}/plugin/example_key_management.so
rm %{buildroot}%{_libdir}/%{majorname}/plugin/func_test.so
rm %{buildroot}%{_libdir}/%{majorname}/plugin/ha_example.so
rm %{buildroot}%{_libdir}/%{majorname}/plugin/ha_test_sql_discovery.so
rm %{buildroot}%{_libdir}/%{majorname}/plugin/libdaemon_example.so
rm %{buildroot}%{_libdir}/%{majorname}/plugin/mypluglib.so
rm %{buildroot}%{_libdir}/%{majorname}/plugin/qa_auth_client.so
rm %{buildroot}%{_libdir}/%{majorname}/plugin/qa_auth_interface.so
rm %{buildroot}%{_libdir}/%{majorname}/plugin/qa_auth_server.so
rm %{buildroot}%{_libdir}/%{majorname}/plugin/test_sql_service.so
rm %{buildroot}%{_libdir}/%{majorname}/plugin/test_versioning.so
rm %{buildroot}%{_libdir}/%{majorname}/plugin/type_mysql_timestamp.so
rm %{buildroot}%{_libdir}/%{majorname}/plugin/type_test.so
rm %{buildroot}%{_libdir}/%{majorname}/plugin/daemon_example.ini
%endif
%if %{without rocksdb}
@ -1590,23 +1609,31 @@ fi
%dir %{_libdir}/%{majorname}
%dir %{_libdir}/%{majorname}/plugin
%{_libdir}/%{majorname}/plugin/*
%{?with_oqgraph:%exclude %{_libdir}/%{majorname}/plugin/ha_oqgraph.so}
%{?with_connect:%exclude %{_libdir}/%{majorname}/plugin/ha_connect.so}
%{?with_cracklib:%exclude %{_libdir}/%{majorname}/plugin/cracklib_password_check.so}
%{?with_rocksdb:%exclude %{_libdir}/%{majorname}/plugin/ha_rocksdb.so}
%{?with_gssapi:%exclude %{_libdir}/%{majorname}/plugin/auth_gssapi.so}
%{?with_sphinx:%exclude %{_libdir}/%{majorname}/plugin/ha_sphinx.so}
%{?with_s3:%exclude %{_libdir}/%{majorname}/plugin/ha_s3.so}
%if %{with clibrary}
%exclude %{_libdir}/%{majorname}/plugin/dialog.so
%exclude %{_libdir}/%{majorname}/plugin/mysql_clear_password.so
%endif
# PAM plugin; moved to a standalone sub-package
%exclude %{_libdir}/%{majorname}/plugin/{auth_pam_v1.so,auth_pam.so}
%exclude %dir %{_libdir}/%{majorname}/plugin/auth_pam_tool_dir
%exclude %{_libdir}/%{majorname}/plugin/auth_pam_tool_dir/auth_pam_tool
%{_libdir}/%{majorname}/plugin/auth_ed25519.so
%{_libdir}/%{majorname}/plugin/disks.so
%{_libdir}/%{majorname}/plugin/file_key_management.so
%{_libdir}/%{majorname}/plugin/ha_archive.so
%{_libdir}/%{majorname}/plugin/ha_blackhole.so
%{_libdir}/%{majorname}/plugin/ha_federated.so
%{_libdir}/%{majorname}/plugin/ha_federatedx.so
%{_libdir}/%{majorname}/plugin/ha_spider.so
%{_libdir}/%{majorname}/plugin/handlersocket.so
%{?with_hashicorp:%{_libdir}/%{majorname}/plugin/hashicorp_key_management.so}
%{_libdir}/%{majorname}/plugin/locales.so
%{_libdir}/%{majorname}/plugin/metadata_lock_info.so
%{_libdir}/%{majorname}/plugin/password_reuse_check.so
%{?with_bzip2:%{_libdir}/%{majorname}/plugin/provider_bzip2.so}
%{?with_lz4:%{_libdir}/%{majorname}/plugin/provider_lz4.so}
%{?with_lzma:%{_libdir}/%{majorname}/plugin/provider_lzma.so}
%{?with_lzo:%{_libdir}/%{majorname}/plugin/provider_lzo.so}
%{?with_snappy:%{_libdir}/%{majorname}/plugin/provider_snappy.so}
%{_libdir}/%{majorname}/plugin/query_cache_info.so
%{_libdir}/%{majorname}/plugin/query_response_time.so
%{_libdir}/%{majorname}/plugin/server_audit.so
%{_libdir}/%{majorname}/plugin/simple_password_check.so
%{_libdir}/%{majorname}/plugin/sql_errlog.so
%{_libdir}/%{majorname}/plugin/type_mysql_json.so
%{?with_galera:%{_libdir}/%{majorname}/plugin/wsrep_info.so}
%{_datadir}/%{majorname}/mini-benchmark
%{_datadir}/%{majorname}/fill_help_tables.sql
@ -1625,6 +1652,7 @@ fi
%dir %{_datadir}/%{majorname}-server/groonga-normalizer-mysql
%{_datadir}/%{majorname}/mroonga/install.sql
%{_datadir}/%{majorname}/mroonga/uninstall.sql
%{_libdir}/%{majorname}/plugin/ha_mroonga.so
%license %{_datadir}/%{majorname}/mroonga/COPYING
%license %{_datadir}/%{majorname}/mroonga/AUTHORS
%license %{_datadir}/%{majorname}-server/groonga-normalizer-mysql/lgpl-2.0.txt
@ -1784,6 +1812,27 @@ fi
%endif
%{_bindir}/{mysql_client_test,mysqltest,mariadb-client-test,mariadb-test}
%{_bindir}/my_safe_process
%dir %{_libdir}/%{majorname}/plugin
# shared objects required for testing
%{_libdir}/%{majorname}/plugin/adt_null.so
%{_libdir}/%{majorname}/plugin/auth_0x0100.so
%{_libdir}/%{majorname}/plugin/auth_test_plugin.so
%{_libdir}/%{majorname}/plugin/debug_key_management.so
%{_libdir}/%{majorname}/plugin/dialog_examples.so
%{_libdir}/%{majorname}/plugin/example_key_management.so
%{_libdir}/%{majorname}/plugin/func_test.so
%{_libdir}/%{majorname}/plugin/ha_example.so
%{_libdir}/%{majorname}/plugin/ha_test_sql_discovery.so
%{_libdir}/%{majorname}/plugin/libdaemon_example.so
%{_libdir}/%{majorname}/plugin/mypluglib.so
%{_libdir}/%{majorname}/plugin/qa_auth_client.so
%{_libdir}/%{majorname}/plugin/qa_auth_interface.so
%{_libdir}/%{majorname}/plugin/qa_auth_server.so
%{_libdir}/%{majorname}/plugin/test_sql_service.so
%{_libdir}/%{majorname}/plugin/test_versioning.so
%{_libdir}/%{majorname}/plugin/type_mysql_timestamp.so
%{_libdir}/%{majorname}/plugin/type_test.so
%{_libdir}/%{majorname}/plugin/daemon_example.ini
%attr(-,mysql,mysql) %{_datadir}/mysql-test
%{_mandir}/man1/{mysql_client_test,mysqltest,mariadb-client-test,mariadb-test}.1*
%{_mandir}/man1/my_safe_process.1*