From a01b81c2d2054bb8e793cabb99c4621714e971d9 Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Thu, 30 Mar 2023 15:43:26 -0700 Subject: [PATCH] avoid non-module variants from showing up in the wrong place --- autocatalog.cfg | 53 +------------------------------------------------ 1 file changed, 1 insertion(+), 52 deletions(-) diff --git a/autocatalog.cfg b/autocatalog.cfg index eef6e99..81166c6 100644 --- a/autocatalog.cfg +++ b/autocatalog.cfg @@ -123,7 +123,6 @@ exclude_filter { key: "*" glob_match: "glibc32" glob_match: "libgcc32" - glob_match: "scap-security-guide-rule-playbooks" glob_match: "*openh264*" glob_match: "python3-openipmi" glob_match: "OpenIPMI-perl" @@ -907,13 +906,6 @@ include_filter { glob_match: "compat-sap-c++-12" } } -include_filter { - repo_match: "^Buildroot$" - arch { - key: "*" - glob_match: "*" - } -} package { name: "389-ds-base" type: PACKAGE_TYPE_NORMAL_FORK @@ -20394,7 +20386,6 @@ package { include_filter: "nginx-all-modules.noarch" include_filter: "nginx-core.aarch64" include_filter: "nginx-filesystem.noarch" - include_filter: "nginx-mod-devel.aarch64" include_filter: "nginx-mod-http-image-filter.aarch64" include_filter: "nginx-mod-http-perl.aarch64" include_filter: "nginx-mod-http-xslt-filter.aarch64" @@ -20402,7 +20393,6 @@ package { include_filter: "nginx-mod-stream.aarch64" include_filter: "nginx.aarch64" include_filter: "nginx-core.ppc64le" - include_filter: "nginx-mod-devel.ppc64le" include_filter: "nginx-mod-http-image-filter.ppc64le" include_filter: "nginx-mod-http-perl.ppc64le" include_filter: "nginx-mod-http-xslt-filter.ppc64le" @@ -20410,7 +20400,6 @@ package { include_filter: "nginx-mod-stream.ppc64le" include_filter: "nginx.ppc64le" include_filter: "nginx-core.s390x" - include_filter: "nginx-mod-devel.s390x" include_filter: "nginx-mod-http-image-filter.s390x" include_filter: "nginx-mod-http-perl.s390x" include_filter: "nginx-mod-http-xslt-filter.s390x" @@ -20418,7 +20407,6 @@ package { include_filter: "nginx-mod-stream.s390x" include_filter: "nginx.s390x" include_filter: "nginx-core.x86_64" - include_filter: "nginx-mod-devel.x86_64" include_filter: "nginx-mod-http-image-filter.x86_64" include_filter: "nginx-mod-http-perl.x86_64" include_filter: "nginx-mod-http-xslt-filter.x86_64" @@ -20513,23 +20501,19 @@ package { repository { name: "AppStream" module_stream: "18" - include_filter: "nodejs-devel.aarch64" include_filter: "nodejs-docs.noarch" include_filter: "nodejs-full-i18n.aarch64" include_filter: "nodejs-libs.aarch64" include_filter: "nodejs.aarch64" include_filter: "npm.aarch64" - include_filter: "nodejs-devel.ppc64le" include_filter: "nodejs-full-i18n.ppc64le" include_filter: "nodejs-libs.ppc64le" include_filter: "nodejs.ppc64le" include_filter: "npm.ppc64le" - include_filter: "nodejs-devel.s390x" include_filter: "nodejs-full-i18n.s390x" include_filter: "nodejs-libs.s390x" include_filter: "nodejs.s390x" include_filter: "npm.s390x" - include_filter: "nodejs-devel.x86_64" include_filter: "nodejs-full-i18n.x86_64" include_filter: "nodejs-libs.i686" include_filter: "nodejs-libs.x86_64" @@ -25025,60 +25009,35 @@ package { name: "AppStream" module_stream: "15" include_filter: "postgresql-contrib.aarch64" - include_filter: "postgresql-docs.aarch64" include_filter: "postgresql-plperl.aarch64" include_filter: "postgresql-plpython3.aarch64" include_filter: "postgresql-pltcl.aarch64" - include_filter: "postgresql-private-devel.aarch64" include_filter: "postgresql-private-libs.aarch64" - include_filter: "postgresql-server-devel.aarch64" include_filter: "postgresql-server.aarch64" - include_filter: "postgresql-static.aarch64" - include_filter: "postgresql-test-rpm-macros.noarch" - include_filter: "postgresql-test.aarch64" - include_filter: "postgresql-upgrade-devel.aarch64" include_filter: "postgresql-upgrade.aarch64" include_filter: "postgresql.aarch64" include_filter: "postgresql-contrib.ppc64le" - include_filter: "postgresql-docs.ppc64le" include_filter: "postgresql-plperl.ppc64le" include_filter: "postgresql-plpython3.ppc64le" include_filter: "postgresql-pltcl.ppc64le" - include_filter: "postgresql-private-devel.ppc64le" include_filter: "postgresql-private-libs.ppc64le" - include_filter: "postgresql-server-devel.ppc64le" include_filter: "postgresql-server.ppc64le" - include_filter: "postgresql-static.ppc64le" - include_filter: "postgresql-test.ppc64le" - include_filter: "postgresql-upgrade-devel.ppc64le" include_filter: "postgresql-upgrade.ppc64le" include_filter: "postgresql.ppc64le" include_filter: "postgresql-contrib.s390x" - include_filter: "postgresql-docs.s390x" include_filter: "postgresql-plperl.s390x" include_filter: "postgresql-plpython3.s390x" include_filter: "postgresql-pltcl.s390x" - include_filter: "postgresql-private-devel.s390x" include_filter: "postgresql-private-libs.s390x" - include_filter: "postgresql-server-devel.s390x" include_filter: "postgresql-server.s390x" - include_filter: "postgresql-static.s390x" - include_filter: "postgresql-test.s390x" - include_filter: "postgresql-upgrade-devel.s390x" include_filter: "postgresql-upgrade.s390x" include_filter: "postgresql.s390x" include_filter: "postgresql-contrib.x86_64" - include_filter: "postgresql-docs.x86_64" include_filter: "postgresql-plperl.x86_64" include_filter: "postgresql-plpython3.x86_64" include_filter: "postgresql-pltcl.x86_64" - include_filter: "postgresql-private-devel.x86_64" include_filter: "postgresql-private-libs.x86_64" - include_filter: "postgresql-server-devel.x86_64" include_filter: "postgresql-server.x86_64" - include_filter: "postgresql-static.x86_64" - include_filter: "postgresql-test.x86_64" - include_filter: "postgresql-upgrade-devel.x86_64" include_filter: "postgresql-upgrade.x86_64" include_filter: "postgresql.x86_64" } @@ -27745,10 +27704,8 @@ package { repository { name: "AppStream" module_stream: "3.1" - include_filter: "ruby-bundled-gems.aarch64" include_filter: "ruby-default-gems.noarch" include_filter: "ruby-devel.aarch64" - include_filter: "ruby-doc.noarch" include_filter: "ruby-libs.aarch64" include_filter: "ruby.aarch64" include_filter: "rubygem-bigdecimal.aarch64" @@ -27760,7 +27717,6 @@ package { include_filter: "rubygem-power_assert.noarch" include_filter: "rubygem-psych.aarch64" include_filter: "rubygem-rake.noarch" - include_filter: "rubygem-rbs.aarch64" include_filter: "rubygem-rbs.noarch" include_filter: "rubygem-rdoc.noarch" include_filter: "rubygem-rexml.noarch" @@ -27769,7 +27725,6 @@ package { include_filter: "rubygem-typeprof.noarch" include_filter: "rubygems-devel.noarch" include_filter: "rubygems.noarch" - include_filter: "ruby-bundled-gems.ppc64le" include_filter: "ruby-devel.ppc64le" include_filter: "ruby-libs.ppc64le" include_filter: "ruby.ppc64le" @@ -27777,8 +27732,6 @@ package { include_filter: "rubygem-io-console.ppc64le" include_filter: "rubygem-json.ppc64le" include_filter: "rubygem-psych.ppc64le" - include_filter: "rubygem-rbs.ppc64le" - include_filter: "ruby-bundled-gems.s390x" include_filter: "ruby-devel.s390x" include_filter: "ruby-libs.s390x" include_filter: "ruby.s390x" @@ -27786,8 +27739,6 @@ package { include_filter: "rubygem-io-console.s390x" include_filter: "rubygem-json.s390x" include_filter: "rubygem-psych.s390x" - include_filter: "rubygem-rbs.s390x" - include_filter: "ruby-bundled-gems.x86_64" include_filter: "ruby-devel.i686" include_filter: "ruby-devel.x86_64" include_filter: "ruby-libs.i686" @@ -27798,7 +27749,6 @@ package { include_filter: "rubygem-io-console.x86_64" include_filter: "rubygem-json.x86_64" include_filter: "rubygem-psych.x86_64" - include_filter: "rubygem-rbs.x86_64" multilib: "x86_64" } repository { @@ -27811,7 +27761,6 @@ package { type: PACKAGE_TYPE_NORMAL_FORK repository { name: "AppStream" - include_filter: "rubygem-mysql2-doc.noarch" include_filter: "rubygem-mysql2.aarch64" include_filter: "rubygem-mysql2.ppc64le" include_filter: "rubygem-mysql2.s390x" @@ -27827,7 +27776,6 @@ package { type: PACKAGE_TYPE_NORMAL_FORK repository { name: "AppStream" - include_filter: "rubygem-pg-doc.noarch" include_filter: "rubygem-pg.aarch64" include_filter: "rubygem-pg.ppc64le" include_filter: "rubygem-pg.s390x" @@ -28375,6 +28323,7 @@ package { repository { name: "AppStream" include_filter: "scap-security-guide-doc.noarch" + include_filter: "scap-security-guide-rule-playbooks.noarch" include_filter: "scap-security-guide.noarch" } }