Update to 5.0.2 upstream release
Upstream tag: v5.0.2 Upstream commit: 3304dd95 Commit authored by Packit automation (https://packit.dev/)
This commit is contained in:
parent
67ebd1f331
commit
acf6510527
1
.gitignore
vendored
1
.gitignore
vendored
@ -1847,3 +1847,4 @@
|
|||||||
/v4.9.1.tar.gz
|
/v4.9.1.tar.gz
|
||||||
/v4.9.2.tar.gz
|
/v4.9.2.tar.gz
|
||||||
/v5.0.0-rc1.tar.gz
|
/v5.0.0-rc1.tar.gz
|
||||||
|
/v5.0.2.tar.gz
|
||||||
|
44
.packit.yaml
44
.packit.yaml
@ -2,9 +2,17 @@
|
|||||||
# See the documentation for more information:
|
# See the documentation for more information:
|
||||||
# https://packit.dev/docs/configuration/
|
# https://packit.dev/docs/configuration/
|
||||||
|
|
||||||
specfile_path: rpm/podman.spec
|
downstream_package_name: podman
|
||||||
upstream_tag_template: v{version}
|
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:
|
srpm_build_deps:
|
||||||
- git-archive-all
|
- git-archive-all
|
||||||
- make
|
- make
|
||||||
@ -16,6 +24,7 @@ actions:
|
|||||||
jobs:
|
jobs:
|
||||||
- job: copr_build
|
- job: copr_build
|
||||||
trigger: pull_request
|
trigger: pull_request
|
||||||
|
packages: [podman-fedora]
|
||||||
notifications:
|
notifications:
|
||||||
failure_comment:
|
failure_comment:
|
||||||
message: "Ephemeral COPR build failed. @containers/packit-build please check."
|
message: "Ephemeral COPR build failed. @containers/packit-build please check."
|
||||||
@ -25,6 +34,17 @@ jobs:
|
|||||||
- fedora-all-aarch64
|
- fedora-all-aarch64
|
||||||
- fedora-eln-x86_64
|
- fedora-eln-x86_64
|
||||||
- fedora-eln-aarch64
|
- 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-x86_64
|
||||||
- centos-stream+epel-next-8-aarch64
|
- centos-stream+epel-next-8-aarch64
|
||||||
- centos-stream+epel-next-9-x86_64
|
- centos-stream+epel-next-9-x86_64
|
||||||
@ -46,6 +66,7 @@ jobs:
|
|||||||
- job: tests
|
- job: tests
|
||||||
identifier: cockpit-revdeps
|
identifier: cockpit-revdeps
|
||||||
trigger: pull_request
|
trigger: pull_request
|
||||||
|
packages: [podman-fedora]
|
||||||
notifications:
|
notifications:
|
||||||
failure_comment:
|
failure_comment:
|
||||||
message: "Cockpit tests failed for commit {commit_sha}. @martinpitt, @jelly, @mvollmer please check."
|
message: "Cockpit tests failed for commit {commit_sha}. @martinpitt, @jelly, @mvollmer please check."
|
||||||
@ -66,16 +87,25 @@ jobs:
|
|||||||
- job: propose_downstream
|
- job: propose_downstream
|
||||||
trigger: release
|
trigger: release
|
||||||
update_release: false
|
update_release: false
|
||||||
|
packages: [podman-fedora]
|
||||||
dist_git_branches:
|
dist_git_branches:
|
||||||
- fedora-development # Implies fedora-rawhide and any branched but unreleased version, will include f40 before f40 is marked stable.
|
- 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
|
- job: koji_build
|
||||||
trigger: commit
|
trigger: commit
|
||||||
|
packages: [podman-fedora]
|
||||||
dist_git_branches:
|
dist_git_branches:
|
||||||
- fedora-development
|
- fedora-all
|
||||||
|
|
||||||
# TODO: Revisit once fedora 40 is branched and manual bodhi is enabled
|
- job: bodhi_update
|
||||||
#- job: bodhi_update
|
trigger: commit
|
||||||
#trigger: commit
|
packages: [podman-fedora]
|
||||||
#dist_git_branches:
|
dist_git_branches:
|
||||||
#- fedora-40 # rawhide updates are created automatically
|
- fedora-branched # rawhide updates are created automatically
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
This repository is maintained by packit.
|
This repository is maintained by packit.
|
||||||
https://packit.dev/
|
https://packit.dev/
|
||||||
The file was generated using packit 0.90.0.post1.dev9+g1f0325d1.
|
The file was generated using packit 0.94.2.
|
||||||
|
23
podman.spec
23
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
|
# If that's what you're reading, Version must be 0, and will be updated by Packit for
|
||||||
# copr and koji builds.
|
# copr and koji builds.
|
||||||
# If you're reading this on dist-git, the version is automatically filled in by Packit.
|
# 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
|
# 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
|
License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
|
||||||
Release: %autorelease
|
Release: %autorelease
|
||||||
@ -81,7 +81,7 @@ BuildRequires: glibc-devel
|
|||||||
BuildRequires: glibc-static
|
BuildRequires: glibc-static
|
||||||
BuildRequires: golang
|
BuildRequires: golang
|
||||||
BuildRequires: git-core
|
BuildRequires: git-core
|
||||||
%if !%{defined gobuild}
|
%if %{undefined rhel} || 0%{?rhel} >= 10
|
||||||
BuildRequires: go-rpm-macros
|
BuildRequires: go-rpm-macros
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: gpgme-devel
|
BuildRequires: gpgme-devel
|
||||||
@ -101,7 +101,14 @@ BuildRequires: python3
|
|||||||
%endif
|
%endif
|
||||||
Requires: catatonit
|
Requires: catatonit
|
||||||
Requires: conmon >= 2:2.1.7-2
|
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
|
Requires: containers-common-extra
|
||||||
|
%endif
|
||||||
%if %{defined rhel} && !%{defined eln}
|
%if %{defined rhel} && !%{defined eln}
|
||||||
Recommends: gvisor-tap-vsock-gvforwarder
|
Recommends: gvisor-tap-vsock-gvforwarder
|
||||||
%else
|
%else
|
||||||
@ -219,7 +226,7 @@ export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full"
|
|||||||
|
|
||||||
export GOPROXY=direct
|
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._installPrefix=%{_prefix} \
|
||||||
-X %{ld_libpod}/config._etcDir=%{_sysconfdir} \
|
-X %{ld_libpod}/config._etcDir=%{_sysconfdir} \
|
||||||
-X %{ld_project}/pkg/systemd/quadlet._binDir=%{_bindir}"
|
-X %{ld_project}/pkg/systemd/quadlet._binDir=%{_bindir}"
|
||||||
@ -248,7 +255,7 @@ LDFLAGS=''
|
|||||||
|
|
||||||
%install
|
%install
|
||||||
install -dp %{buildroot}%{_unitdir}
|
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.bin \
|
||||||
install.man \
|
install.man \
|
||||||
install.systemd \
|
install.systemd \
|
||||||
@ -263,8 +270,8 @@ PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{_sysc
|
|||||||
sed -i 's;%{buildroot};;g' %{buildroot}%{_bindir}/docker
|
sed -i 's;%{buildroot};;g' %{buildroot}%{_bindir}/docker
|
||||||
|
|
||||||
# do not include docker and podman-remote man pages in main package
|
# 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
|
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*" >> podman.file-list
|
echo "$file*" >> %{name}.file-list
|
||||||
done
|
done
|
||||||
|
|
||||||
rm -f %{buildroot}%{_mandir}/man5/docker*.5
|
rm -f %{buildroot}%{_mandir}/man5/docker*.5
|
||||||
@ -276,7 +283,7 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/
|
|||||||
%{!?_licensedir:%global license %doc}
|
%{!?_licensedir:%global license %doc}
|
||||||
|
|
||||||
%files -f %{name}.file-list
|
%files -f %{name}.file-list
|
||||||
%license LICENSE
|
%license LICENSE vendor/modules.txt
|
||||||
%doc README.md CONTRIBUTING.md install.md transfer.md
|
%doc README.md CONTRIBUTING.md install.md transfer.md
|
||||||
%{_bindir}/%{name}
|
%{_bindir}/%{name}
|
||||||
%dir %{_libexecdir}/%{name}
|
%dir %{_libexecdir}/%{name}
|
||||||
@ -300,6 +307,7 @@ cp -pav test/system %{buildroot}/%{_datadir}/%{name}/test/
|
|||||||
%files docker
|
%files docker
|
||||||
%{_bindir}/docker
|
%{_bindir}/docker
|
||||||
%{_mandir}/man1/docker*.1*
|
%{_mandir}/man1/docker*.1*
|
||||||
|
%{_sysconfdir}/profile.d/%{name}-docker.*
|
||||||
%{_tmpfilesdir}/%{name}-docker.conf
|
%{_tmpfilesdir}/%{name}-docker.conf
|
||||||
%{_user_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
|
%files -n %{name}sh
|
||||||
%{_bindir}/%{name}sh
|
%{_bindir}/%{name}sh
|
||||||
|
%{_mandir}/man1/%{name}sh.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
%if %{defined autochangelog}
|
%if %{defined autochangelog}
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (v5.0.0-rc1.tar.gz) = 95452d5489b167cff24620b5a7504e1363d8276cf4e7c026d43ea2e9b24dde1c595b6e763a1065087d876e5ad56e62f7cda6e53838abdeac7eeb3deadcfd88ae
|
SHA512 (v5.0.2.tar.gz) = 70dbac9fc81d66eb9b0a5174f5776b805397005cacca917674d2b001591fadd05a776c956e693bad932e9eefe591c35da5c566e8e9e01db8be42bc454cd03104
|
||||||
|
Loading…
Reference in New Issue
Block a user