From be229450d61d55317c1e5f9c24c9c0ac177a0dfe11fddde9158d5c620d14e53f Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Fri, 20 Aug 2021 07:33:43 +0000 Subject: [PATCH] Accepting request 913272 from home:marxin:branches:server:database - Support both rpmlint 1.x and 2.x. OBS-URL: https://build.opensuse.org/request/show/913272 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=275 --- mariadb-rpmlintrc | 5 ++++- mariadb.changes | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/mariadb-rpmlintrc b/mariadb-rpmlintrc index bbd5407..2143a5a 100644 --- a/mariadb-rpmlintrc +++ b/mariadb-rpmlintrc @@ -12,11 +12,14 @@ addFilter(r'(zero-length|pem-certificate) /usr/share/mysql-test/*') addFilter(r'non-executable-in-bin /usr/bin/wsrep_sst_common 644') addFilter(r'script-without-shebang /usr/bin/wsrep_sst_common') +# Support both rpmlint 1.x and 2.x # Wrong location # wsrep_check_version is a wsrep version check utility. Used in testing only. +addFilter(r'arch-dependent-file-in-usr-share .* /usr/share/mysql-test/lib/My/SafeProcess/wsrep_check_version') addFilter(r'arch-dependent-file-in-usr-share /usr/share/mysql-test/lib/My/SafeProcess/wsrep_check_version') # my_safe_process is an utility that encapsulates process creation, monitoring and cleanup. Used in testing only. +addFilter(r'arch-dependent-file-in-usr-share .* /usr/share/mysql-test/lib/My/SafeProcess/my_safe_process') addFilter(r'arch-dependent-file-in-usr-share /usr/share/mysql-test/lib/My/SafeProcess/my_safe_process') # pam_mariadb_mtr.so is a pam module to test pam authentication plugin. Used in pam.test only. +addFilter(r'arch-dependent-file-in-usr-share .* /usr/share/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so') addFilter(r'arch-dependent-file-in-usr-share /usr/share/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so') - diff --git a/mariadb.changes b/mariadb.changes index 6eeeb54..6d52c6d 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Aug 20 07:32:45 UTC 2021 - Martin Liška + +- Support both rpmlint 1.x and 2.x. + ------------------------------------------------------------------- Thu Aug 19 10:04:42 UTC 2021 - Danilo Spinella