SHA256
1
0
forked from pool/mariadb

Accepting request 931962 from home:dspinella:branches:server:database

- Fix rpmlint errors
- Run spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/931962
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=287
This commit is contained in:
Danilo Spinella 2021-11-17 13:46:57 +00:00 committed by Git OBS Bridge
parent d51fc69c0d
commit 4b6b44299b
2 changed files with 13 additions and 7 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Nov 16 13:28:35 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>
- Fix rpmlint errors
- Run spec-cleaner
-------------------------------------------------------------------
Mon Nov 15 16:59:26 UTC 2021 - Danilo Spinella <danilo.spinella@suse.com>

View File

@ -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