diff --git a/mariadb.changes b/mariadb.changes index 45adac3..83a4324 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 16 13:28:35 UTC 2021 - Danilo Spinella + +- Fix rpmlint errors +- Run spec-cleaner + ------------------------------------------------------------------- Mon Nov 15 16:59:26 UTC 2021 - Danilo Spinella diff --git a/mariadb.spec b/mariadb.spec index 29d50fa..654aa6c 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -86,7 +86,6 @@ BuildRequires: cmake BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: liblz4-devel # GSSAPI BuildRequires: krb5-devel # embedded server libmariadbd @@ -97,6 +96,7 @@ BuildRequires: libbz2-devel # commands history feature BuildRequires: libedit-devel BuildRequires: libevent-devel +BuildRequires: liblz4-devel BuildRequires: libtool BuildRequires: libxml2-devel # CLI graphic and wsrep API @@ -394,8 +394,8 @@ sed -i 's|@localstatedir@|%{_localstatedir}/log|' support-files/mysql-log-rotate rm -f mysql-test/t/file_contents.test mysql-test/r/file_contents.result # Specify perl path on shebangs -for i in `grep -Rl '^#!@PERL@$' .`; do - sed -i 's|@PERL@|%{_bindir}/perl|' $i +for i in `grep -Rl '^#!%{_bindir}/env perl$' .`; do + sed -i 's|%{_bindir}/env perl|%{_bindir}/perl|' $i done # Add our list of tests that fail (correctly or temporarily) to the list of such @@ -768,10 +768,10 @@ cd mysql-test # client does not require server and needs the user too %pre client -f mysql.pre %pre -%service_add_pre mariadb.service +%service_add_pre mariadb.service mariadb.socket mariadb-extra.socket mariadb.target %post -%service_add_post mariadb.service +%service_add_post mariadb.service mariadb@.service mariadb.socket mariadb-extra.socket mariadb.target %tmpfiles_create %{_tmpfilesdir}/mariadb.conf %set_permissions %{_libdir}/mysql/plugin/auth_pam_tool_dir/auth_pam_tool @@ -844,10 +844,10 @@ exit 0 %verify_permissions %{_libdir}/mysql/plugin/auth_pam_tool_dir/auth_pam_tool %preun -%service_del_preun mariadb.service +%service_del_preun mariadb.service mariadb.socket mariadb-extra.socket mariadb.target %postun -%service_del_postun mariadb.service +%service_del_postun mariadb.service mariadb.socket mariadb-extra.socket mariadb.target %post -n libmariadbd%{soname} -p /sbin/ldconfig %postun -n libmariadbd%{soname} -p /sbin/ldconfig