diff --git a/.packit.yaml b/.packit.yaml deleted file mode 100644 index cc47847..0000000 --- a/.packit.yaml +++ /dev/null @@ -1,141 +0,0 @@ ---- -# See the documentation for more information: -# https://packit.dev/docs/configuration/ - -downstream_package_name: podman -upstream_tag_template: v{version} - -packages: - podman-fedora: - pkg_tool: fedpkg - specfile_path: rpm/podman.spec - podman-centos: - pkg_tool: centpkg - specfile_path: rpm/podman.spec - podman-rhel: - specfile_path: rpm/podman.spec - podman-eln: - specfile_path: rpm/podman.spec - -srpm_build_deps: - - git-archive-all - - make - -actions: - fix-spec-file: - - "bash .packit.sh" - -jobs: - - job: copr_build - trigger: pull_request - packages: [podman-fedora] - notifications: &packit_build_failure_notification - failure_comment: - message: "Ephemeral COPR build failed. @containers/packit-build please check." - enable_net: true - targets: - - fedora-development-x86_64 - - fedora-development-aarch64 - - fedora-latest-x86_64 - - fedora-latest-aarch64 - - fedora-latest-stable-x86_64 - - fedora-latest-stable-aarch64 - - fedora-40-x86_64 - - fedora-40-aarch64 - - - job: copr_build - trigger: pull_request - packages: [podman-eln] - notifications: *packit_build_failure_notification - enable_net: true - targets: - fedora-eln-x86_64: - additional_repos: - - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/x86_64/" - fedora-eln-aarch64: - additional_repos: - - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/aarch64/" - - - job: copr_build - trigger: pull_request - packages: [podman-centos] - notifications: *packit_build_failure_notification - enable_net: true - targets: - - centos-stream-9-x86_64 - - centos-stream-9-aarch64 - - centos-stream-10-x86_64 - - centos-stream-10-aarch64 - - - job: copr_build - trigger: pull_request - packages: [podman-rhel] - notifications: *packit_build_failure_notification - enable_net: true - targets: - - epel-9-x86_64 - - epel-9-aarch64 - - # Run on commit to main branch - - job: copr_build - trigger: commit - packages: [podman-fedora] - notifications: - failure_comment: - message: "podman-next COPR build failed. @containers/packit-build please check." - branch: main - owner: rhcontainerbot - project: podman-next - enable_net: true - - - job: tests - identifier: cockpit-revdeps - trigger: pull_request - packages: [podman-fedora] - notifications: - failure_comment: - message: "Cockpit tests failed for commit {commit_sha}. @martinpitt, @jelly, @mvollmer please check." - targets: - - fedora-latest-stable - - fedora-development - tf_extra_params: - environments: - - artifacts: - - type: repository-file - id: https://copr.fedorainfracloud.org/coprs/g/cockpit/main-builds/repo/fedora-$releasever/group_cockpit-main-builds-fedora-$releasever.repo - - type: repository-file - id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo - tmt: - context: - revdeps: "yes" - - - job: propose_downstream - trigger: release - update_release: false - packages: [podman-fedora] - dist_git_branches: &fedora_targets - - fedora-all - - - job: propose_downstream - trigger: release - update_release: false - packages: [podman-centos] - dist_git_branches: - - c10s - - - job: koji_build - trigger: commit - sidetag_group: podman-releases - dist_git_branches: *fedora_targets - - - job: bodhi_update - trigger: koji_build - sidetag_group: podman-releases - # Dependencies are not rpm dependencies, but packages that should go in the - # same bodhi update - # Ref: https://packit.dev/docs/fedora-releases-guide/releasing-multiple-packages - dependencies: - - buildah - - containers-common - - skopeo - dist_git_branches: *fedora_targets diff --git a/README.packit b/README.packit deleted file mode 100644 index 459869a..0000000 --- a/README.packit +++ /dev/null @@ -1,3 +0,0 @@ -This repository is maintained by packit. -https://packit.dev/ -The file was generated using packit 0.101.0. diff --git a/podman.spec b/podman.spec index 4b703a7..3c3dddf 100644 --- a/podman.spec +++ b/podman.spec @@ -8,8 +8,8 @@ %endif %global import_path github.com/containers/podman -#%%global branch v5.4-rhel -%global commit0 f9f7d48b24b1ca4403f189caaeab1cb8ff4a9aa2 +%global branch v5.4-rhel +%global commit0 5e3accd612e57d8e246041b459f9bf5115954bbc %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global gomodulesmode GO111MODULE=on @@ -63,7 +63,7 @@ Epoch: 6 Version: 5.4.0 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 -Release: 1%{?dist} +Release: 2%{?dist} %if %{defined golang_arches_future} ExclusiveArch: %{golang_arches_future} %else @@ -390,6 +390,11 @@ ln -s ../virtiofsd %{buildroot}%{_libexecdir}/%{name} %endif %changelog +* Fri Mar 07 2025 Jindrich Novy - 6:5.4.0-2 +- update to the latest content of https://github.com/containers/podman/tree/v5.4-rhel + (https://github.com/containers/podman/commit/5e3accd) +- Related: RHEL-80817 + * Wed Feb 12 2025 Jindrich Novy - 6:5.4.0-1 - update to https://github.com/containers/podman/releases/tag/v5.4.0 - Related: RHEL-58990 diff --git a/sources b/sources index 7d18c60..07640d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (podman-5.4.0-f9f7d48.tar.gz) = 44552281b586db588da2dc3af1b3c65ebd9ef25f815ee4061631d553aff41e4e5c622faf2f8f92c4d5f800d9d9d95ab0c5f4962f3608be57cac4a5d9479caef6 +SHA512 (v5.4-rhel-5e3accd.tar.gz) = ef83d9df34d97bd6253c3110d5ef270987163b3789b37605b84fd9bfe0008e9c44cdbe782fc2f38f63b1bf60b8061cb28e0aaba59a39a3021fd09e7d49d68493