From 6cc701f2d9443da4a6ef8842ebc4cbaab2f5cc7b Mon Sep 17 00:00:00 2001 From: Seda Gundogdu Date: Tue, 23 Jul 2024 13:58:19 +0300 Subject: [PATCH] Simplified and made suitable for each version --- packaging_ignore.yml | 9 ++++----- rpmlintrc | 12 +++++------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/packaging_ignore.yml b/packaging_ignore.yml index 705b5033..be2c7a5a 100644 --- a/packaging_ignore.yml +++ b/packaging_ignore.yml @@ -9,12 +9,11 @@ base: - "gpg: WARNING: options in `/root/.gnupg/gpg.conf' are not yet active during this run" - ".* warning: overriding recipe for target 'check'" - ".*: E: zero-length /usr/pgsql-.*/share/extension/.*" - - "Wrote: /citus-rpm-build/x86_64/topn_11-.*.rpm" - - "Wrote: /citus-rpm-build/x86_64/topn_11-debuginfo-.*.rpm" + - "Wrote: /citus-rpm-build/x86_64/topn_\d+-.*.rpm" + - "Wrote: /citus-rpm-build/x86_64/topn_\d+-debuginfo-.*.rpm" - "1 packages and 0 specfiles checked; 0 errors, 0 warnings." - - "Wrote: /citus-rpm-build/x86_64/topn_12-debugsource-.*\\.rpm" - - "Wrote: /citus-rpm-build/x86_64/topn_12-debuginfo-.*\\.rpm" - - "Wrote: /citus-rpm-build/x86_64/topn_12-.*.rpm" + - "Wrote: /citus-rpm-build/x86_64/topn_\d+-debugsource-.*.rpm" + debian: - ".*: W: invalid-license Commercial" - ".*: W: no-documentation" diff --git a/rpmlintrc b/rpmlintrc index 0b1e3a55..aa1664bf 100644 --- a/rpmlintrc +++ b/rpmlintrc @@ -13,13 +13,11 @@ addFilter('spelling-error %description -l en_US topn') addFilter(".*: E: zero-length /usr/pgsql-.*/share/extension/.*") -addFilter("Wrote: /citus-rpm-build/x86_64/topn_11-.*\\.rpm") -addFilter("Wrote: /citus-rpm-build/x86_64/topn_11-debuginfo-.*\\.rpm") +addFilter("Wrote: /citus-rpm-build/x86_64/topn_\\d+-.*\\.rpm") +addFilter("Wrote: /citus-rpm-build/x86_64/topn_\\d+-debuginfo-.*\\.rpm") addFilter("1 packages and 0 specfiles checked; 0 errors, 0 warnings.") -addFilter(".*: Wrote: /citus-rpm-build/x86_64/topn_11-.*\\.rpm") -addFilter(".*: Wrote: /citus-rpm-build/x86_64/topn_11-debuginfo-.*\\.rpm") +addFilter(".*: Wrote: /citus-rpm-build/x86_64/topn_\\d+-.*\\.rpm") +addFilter(".*: Wrote: /citus-rpm-build/x86_64/topn_\\d+-debuginfo-.*\\.rpm") addFilter(".*: 1 packages and 0 specfiles checked; 0 errors, 0 warnings.") - -addFilter("Wrote: /citus-rpm-build/x86_64/topn_12-debugsource-.*\\.rpm") -addFilter("Wrote: /citus-rpm-build/x86_64/topn_12-debuginfo-.*\\.rpm") +addFilter("Wrote: /citus-rpm-build/x86_64/topn_\\d+-debugsource-.*\\.rpm")