From 4b2581acc763eecfbb1953e09272b979a7883536 Mon Sep 17 00:00:00 2001 From: Jan Pazdziora Date: Fri, 16 Feb 2024 15:13:17 +0100 Subject: [PATCH] Configure the GPG key for Fedora 40. --- .github/workflows/build-test.yaml | 2 +- rpm2swidtag.conf.d/fedora-40.conf | 4 ++++ rpm2swidtag.conf.d/fedora-rawhide.conf | 2 +- setup.py | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 rpm2swidtag.conf.d/fedora-40.conf diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml index db00104..a085052 100644 --- a/.github/workflows/build-test.yaml +++ b/.github/workflows/build-test.yaml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ fedora-rawhide, fedora-39, fedora-38, centos-stream-8, centos-stream-9 ] + os: [ fedora-rawhide, fedora-40, fedora-39, fedora-38, centos-stream-8, centos-stream-9 ] steps: - uses: actions/checkout@v3 - name: Set the right OS in the Dockerfile diff --git a/rpm2swidtag.conf.d/fedora-40.conf b/rpm2swidtag.conf.d/fedora-40.conf new file mode 100644 index 0000000..2e1f80f --- /dev/null +++ b/rpm2swidtag.conf.d/fedora-40.conf @@ -0,0 +1,4 @@ +[link Fedora 40] +key-id = a15b79cc +software-creator-file = /usr/lib/swidtag/fedoraproject.org/org.fedoraproject.Fedora-40.swidtag +component-of-file = /usr/lib/swidtag/fedoraproject.org/org.fedoraproject.Fedora-40.swidtag diff --git a/rpm2swidtag.conf.d/fedora-rawhide.conf b/rpm2swidtag.conf.d/fedora-rawhide.conf index ad64dc4..43734e9 100644 --- a/rpm2swidtag.conf.d/fedora-rawhide.conf +++ b/rpm2swidtag.conf.d/fedora-rawhide.conf @@ -1,4 +1,4 @@ [link Fedora rawhide] -key-id = a15b79cc +key-id = e99d6ad1 software-creator-file = /usr/lib/swidtag/fedoraproject.org/org.fedoraproject.Fedora-rawhide.swidtag component-of-file = /usr/lib/swidtag/fedoraproject.org/org.fedoraproject.Fedora-rawhide.swidtag diff --git a/setup.py b/setup.py index 9093084..7eb85e2 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ scripts = ['bin/rpm2swidtag', 'bin/dnf-plugin-swidtags-update-from-0.7', 'bin/swidq'], data_files = [ ('/etc/rpm2swidtag', ['rpm2swidtag.conf', 'swidtag-template.xml', 'swidtag.xslt', 'rpm2swidtag.xslt', 'rpm2swidtag-tagid.xslt']), - ('/etc/rpm2swidtag/rpm2swidtag.conf.d', ['rpm2swidtag.conf.d/fedora-rawhide.conf', 'rpm2swidtag.conf.d/fedora-39.conf', 'rpm2swidtag.conf.d/fedora-38.conf', 'rpm2swidtag.conf.d/fedora-37.conf', 'rpm2swidtag.conf.d/fedora-36.conf']), + ('/etc/rpm2swidtag/rpm2swidtag.conf.d', ['rpm2swidtag.conf.d/fedora-rawhide.conf', 'rpm2swidtag.conf.d/fedora-40.conf', 'rpm2swidtag.conf.d/fedora-39.conf', 'rpm2swidtag.conf.d/fedora-38.conf', 'rpm2swidtag.conf.d/fedora-37.conf']), ('/etc/swid', ['swidq.conf']), ('/etc/swid/swidtags.d', []), ('/usr/share/swidq/stylesheets', ['swidq-info.xslt', 'swidq-dump.xslt', 'swidq-files.xslt', 'swidq-xml.xslt']),