From acf651052707d549e52376c7ee6be6b22f595708 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 18 Apr 2024 09:46:55 -0400 Subject: [PATCH] Update to 5.0.2 upstream release Upstream tag: v5.0.2 Upstream commit: 3304dd95 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 1 + .packit.yaml | 44 +++++++++++++++++++++++++++++++++++++------- README.packit | 2 +- podman.spec | 23 ++++++++++++++++------- sources | 2 +- 5 files changed, 56 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 1039674..d3487b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1847,3 +1847,4 @@ /v4.9.1.tar.gz /v4.9.2.tar.gz /v5.0.0-rc1.tar.gz +/v5.0.2.tar.gz diff --git a/.packit.yaml b/.packit.yaml index afcebd1..83a5d0e 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -2,9 +2,17 @@ # See the documentation for more information: # https://packit.dev/docs/configuration/ -specfile_path: rpm/podman.spec +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 + srpm_build_deps: - git-archive-all - make @@ -16,6 +24,7 @@ actions: jobs: - job: copr_build trigger: pull_request + packages: [podman-fedora] notifications: failure_comment: message: "Ephemeral COPR build failed. @containers/packit-build please check." @@ -25,6 +34,17 @@ jobs: - fedora-all-aarch64 - fedora-eln-x86_64 - fedora-eln-aarch64 + additional_repos: + - "copr://rhcontainerbot/podman-next" + + - job: copr_build + trigger: pull_request + packages: [podman-centos] + notifications: + failure_comment: + message: "Ephemeral COPR build failed. @containers/packit-build please check." + enable_net: true + targets: - centos-stream+epel-next-8-x86_64 - centos-stream+epel-next-8-aarch64 - centos-stream+epel-next-9-x86_64 @@ -46,6 +66,7 @@ jobs: - 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." @@ -66,16 +87,25 @@ jobs: - job: propose_downstream trigger: release update_release: false + packages: [podman-fedora] dist_git_branches: - fedora-development # Implies fedora-rawhide and any branched but unreleased version, will include f40 before f40 is marked stable. + - job: propose_downstream + trigger: release + update_release: false + packages: [podman-centos] + dist_git_branches: + - c10s + - job: koji_build trigger: commit + packages: [podman-fedora] dist_git_branches: - - fedora-development + - fedora-all - # TODO: Revisit once fedora 40 is branched and manual bodhi is enabled - #- job: bodhi_update - #trigger: commit - #dist_git_branches: - #- fedora-40 # rawhide updates are created automatically + - job: bodhi_update + trigger: commit + packages: [podman-fedora] + dist_git_branches: + - fedora-branched # rawhide updates are created automatically diff --git a/README.packit b/README.packit index 29cc7d8..60cc823 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 0.90.0.post1.dev9+g1f0325d1. +The file was generated using packit 0.94.2. diff --git a/podman.spec b/podman.spec index 68b810f..2c02a7e 100644 --- a/podman.spec +++ b/podman.spec @@ -57,7 +57,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: 5.0.0~rc1 +Version: 5.0.2 # 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: %autorelease @@ -81,7 +81,7 @@ BuildRequires: glibc-devel BuildRequires: glibc-static BuildRequires: golang BuildRequires: git-core -%if !%{defined gobuild} +%if %{undefined rhel} || 0%{?rhel} >= 10 BuildRequires: go-rpm-macros %endif BuildRequires: gpgme-devel @@ -101,7 +101,14 @@ BuildRequires: python3 %endif Requires: catatonit Requires: conmon >= 2:2.1.7-2 +%if %{defined fedora} && 0%{?fedora} >= 40 +# TODO: Remove the f40 conditional after a few releases to keep conditionals to +# a minimum +# Ref: https://bugzilla.redhat.com/show_bug.cgi?id=2269148 +Requires: containers-common-extra >= 5:0.58.0-1 +%else Requires: containers-common-extra +%endif %if %{defined rhel} && !%{defined eln} Recommends: gvisor-tap-vsock-gvforwarder %else @@ -219,7 +226,7 @@ export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full" export GOPROXY=direct -LDFLAGS="-X %{ld_libpod}/define.buildInfo=$(date +%s) \ +LDFLAGS="-X %{ld_libpod}/define.buildInfo=${SOURCE_DATE_EPOCH:-$(date +%s)} \ -X %{ld_libpod}/config._installPrefix=%{_prefix} \ -X %{ld_libpod}/config._etcDir=%{_sysconfdir} \ -X %{ld_project}/pkg/systemd/quadlet._binDir=%{_bindir}" @@ -248,7 +255,7 @@ LDFLAGS='' %install install -dp %{buildroot}%{_unitdir} -PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{_sysconfdir} \ +PODMAN_VERSION=%{version} %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} ETCDIR=%{_sysconfdir} \ install.bin \ install.man \ install.systemd \ @@ -263,8 +270,8 @@ PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{_sysc sed -i 's;%{buildroot};;g' %{buildroot}%{_bindir}/docker # do not include docker and podman-remote man pages in main package -for file in `find %{buildroot}%{_mandir}/man[15] -type f | sed "s,%{buildroot},," | grep -v -e remote -e docker`; do - echo "$file*" >> podman.file-list +for file in `find %{buildroot}%{_mandir}/man[15] -type f | sed "s,%{buildroot},," | grep -v -e %{name}sh.1 -e remote -e docker`; do + echo "$file*" >> %{name}.file-list done rm -f %{buildroot}%{_mandir}/man5/docker*.5 @@ -276,7 +283,7 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %{!?_licensedir:%global license %doc} %files -f %{name}.file-list -%license LICENSE +%license LICENSE vendor/modules.txt %doc README.md CONTRIBUTING.md install.md transfer.md %{_bindir}/%{name} %dir %{_libexecdir}/%{name} @@ -300,6 +307,7 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %files docker %{_bindir}/docker %{_mandir}/man1/docker*.1* +%{_sysconfdir}/profile.d/%{name}-docker.* %{_tmpfilesdir}/%{name}-docker.conf %{_user_tmpfilesdir}/%{name}-docker.conf @@ -318,6 +326,7 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/ %files -n %{name}sh %{_bindir}/%{name}sh +%{_mandir}/man1/%{name}sh.1* %changelog %if %{defined autochangelog} diff --git a/sources b/sources index 8937017..9b50362 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v5.0.0-rc1.tar.gz) = 95452d5489b167cff24620b5a7504e1363d8276cf4e7c026d43ea2e9b24dde1c595b6e763a1065087d876e5ad56e62f7cda6e53838abdeac7eeb3deadcfd88ae +SHA512 (v5.0.2.tar.gz) = 70dbac9fc81d66eb9b0a5174f5776b805397005cacca917674d2b001591fadd05a776c956e693bad932e9eefe591c35da5c566e8e9e01db8be42bc454cd03104