public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/containers-common] f45: Update to 0.69.2 upstream release
@ 2026-09-15 17:29 Packit
0 siblings, 0 replies; only message in thread
From: Packit @ 2026-09-15 17:29 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/containers-common
Branch : f45
Commit : d783587993d943b4fe274fb5c37de2de132695d1
Author : Packit <hello@packit.dev>
Date : 2026-09-15T17:10:44+00:00
Stats : +32/-16 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/containers-common/c/d783587993d943b4fe274fb5c37de2de132695d1?branch=f45
Log:
Update to 0.69.2 upstream release
Upstream tag: common/v0.69.2
Upstream commit: 3bbb182d
Commit authored by Packit automation (https://packit.dev/)
---
diff --git a/.gitignore b/.gitignore
index e1183b2..dd241ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,6 @@
/v0.68.0.tar.gz
/v0.68.1.tar.gz
/v0.69.0.tar.gz
+/v0.69.2.tar.gz
+/63405576.txt
+/REKOR-signing-key
diff --git a/.packit.yaml b/.packit.yaml
index 733f129..ba5eb36 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -75,6 +75,7 @@ jobs:
packages: [containers-common-fedora]
dist_git_branches: &fedora_targets
- fedora-rawhide
+ - fedora-45
# Ignore CentOS Stream for now
- job: propose_downstream
diff --git a/README.packit b/README.packit
index d816803..5fae86e 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
This repository is maintained by packit.
https://packit.dev/
-The file was generated using packit 1.16.2.
+The file was generated using packit 1.16.3.post1.dev4+gbf42df0bb.
diff --git a/containers-common.spec b/containers-common.spec
index 5e01e9a..0a5a1e5 100644
--- a/containers-common.spec
+++ b/containers-common.spec
@@ -13,6 +13,12 @@
%define netavark_epoch 2
%endif
+# Red Hat keys already exist on rhel envs, need them on Fedora
+# and CentOS Stream.
+%if %{defined fedora} || %{defined centos}
+%define need_redhat_keys 1
+%endif
+
Name: containers-common
%if %{defined copr_build}
Epoch: 102
@@ -25,7 +31,7 @@ Epoch: 5
# If that's what you're reading, Version must be 0, and will be updated by Packit for
# copr and koji builds.
# If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 0.69.0
+Version: 0.69.2
Release: %autorelease
License: Apache-2.0
BuildArch: noarch
@@ -50,10 +56,15 @@ Conflicts: skopeo < 1:1.23
URL: https://github.com/%{project}/%{repo}
Source0: %{url}/archive/refs/tags/common/v%{version}.tar.gz
Source1: https://raw.githubusercontent.com/containers/shortnames/refs/heads/main/shortnames.conf
-# Fetch RPM-GPG-KEY-redhat-release from the authoritative source instead of storing
-# a copy in repo or dist-git. Depending on distribution-gpg-keys rpm is also
-# not an option because that package doesn't exist on CentOS Stream.
-Source2: https://access.redhat.com/security/data/fd431d51.txt
+# Fetch Red Hat sigstore keys from the authoritative source instead of storing
+# a copy in repo or dist-git.
+# SIGSTORE-redhat-release3
+Source2: https://security.access.redhat.com/data/63405576.txt
+# REKOR-signing-key
+# FIXME: This should be fetched from an official .redhat.com URL once available.
+# CentOS Stream doesn't currently use Packit for updates so we're ok to point to
+# this URL.
+Source3: https://gitlab.com/redhat/centos-stream/rpms/containers-common/-/raw/c10s/REKOR-signing-key
%description
This package contains common configuration files and documentation for container
@@ -107,7 +118,7 @@ touch %{buildroot}%{_prefix}/lib/containers/storage/overlay-layers/layers.lock
install -Dp -m0644 %{SOURCE1} %{buildroot}%{_datadir}/containers/registries.conf.d/000-shortnames.conf
install -Dp -m0644 image/default.yaml %{buildroot}%{_datadir}/containers/registries.d/default.yaml
-install -Dp -m0644 image/default-policy.json %{buildroot}%{_datadir}/containers/policy.json
+install -Dp -m0644 common/rpm/policy.json %{buildroot}%{_datadir}/containers/policy.json
install -Dp -m0644 image/registries.conf %{buildroot}%{_datadir}/containers/registries.conf
install -Dp -m0644 storage/storage.conf %{buildroot}%{_datadir}/containers/storage.conf
@@ -123,11 +134,10 @@ install -Dp -m0644 common/rpm/00-fedora-registries.conf %{buildroot}%{_datadir}/
install -Dp -m0644 common/rpm/00-rhel-registries.conf %{buildroot}%{_datadir}/containers/registries.conf.d/00-vendor.conf
%endif
-
-# RPM-GPG-KEY-redhat-release already exists on rhel envs, install only on
-# fedora and centos
-%if %{defined fedora} || %{defined centos}
-install -Dp -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+# Install redhat sigstore keys on Fedora and CentOS
+%if %{defined need_redhat_keys}
+install -Dp -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/sigstore/SIGSTORE-redhat-release3
+install -Dp -m0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pki/sigstore/REKOR-signing-key
%endif
install -Dp -m0644 common/contrib/redhat/registry.access.redhat.com.yaml -t %{buildroot}%{_datadir}/containers/registries.d
@@ -187,8 +197,9 @@ ln -s ../../../..%{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/
%{_prefix}/lib/containers/storage/overlay-layers/layers.lock
-%if 0%{?fedora} || 0%{?centos}
-%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+%if %{defined need_redhat_keys}
+%{_sysconfdir}/pki/sigstore/SIGSTORE-redhat-release3
+%{_sysconfdir}/pki/sigstore/REKOR-signing-key
%endif
%ghost %{_sysconfdir}/containers/storage.conf
%ghost %{_sysconfdir}/containers/containers.conf
diff --git a/sources b/sources
index dbfd6b2..e049a0c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
-SHA512 (v0.69.0.tar.gz) = db2a199a702291b035826c0a27eacdfe2aa6d8a75de52d1c4c76718b1843b5960980ad9735d5d9e18f7f5ca0a5159a54316e8c74f0f17395ef94fd59f43dcaa6
+SHA512 (v0.69.2.tar.gz) = 233ea309ef654e034ff41ca6560ff88a166f57830bceb27f7c1642ed487ebdb8d6430028b998347d5fd2d65e8bcee9da0e75ab4ff45ff69c68071414e317896a
SHA512 (shortnames.conf) = b81f35ff830c9fc373140089cbcb36e64c9a4ab79ce1958700e12e2b6fa98bbe3a64400d9bfc4ca699af12fb6ad48a53087d1b6c2988cf1e218e3cebdabf1f02
-SHA512 (fd431d51.txt) = a22b42ae1f672d628676c4a4006b6573654ac0206086c93ddb2ab4e2914a8351dc8b316cd995eafe5bfa70a2c858eeacb019d8753ad0cfbfc5593d58eab4901e
+SHA512 (63405576.txt) = 26d97a2e187697b9481eb518b8cf04b5f8ce996a880aa09ab7dce0e8564ae0a269b6e7310196795a08d7392d791b835b77b57a557f2e58abaf1cd35b5cd6219e
+SHA512 (REKOR-signing-key) = 1c300333bf2167f8ed3f2549c20c56d2d3c50fec51ccfc3d2d67193c05b3064147d9bab51b8ac342fead0b65f344c8a359cae18cf9a44c5b37821bdac3e5c283
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-09-15 17:29 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-15 17:29 [rpms/containers-common] f45: Update to 0.69.2 upstream release Packit
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox