From f48033e6cb51847679a4fe383dd51d54795a0048 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 19 2021 04:38:55 +0000 Subject: import podman-3.4.1-3.module+el8.6.0+12998+730dddcd --- diff --git a/.gitignore b/.gitignore index 7db3b7f..78ef6d7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -SOURCES/main-800d594.tar.gz SOURCES/podman-machine-cni-0749884.tar.gz SOURCES/v0.1.0.tar.gz SOURCES/v0.1.5.tar.gz SOURCES/v1.3.0.tar.gz +SOURCES/v3.4-c15c154.tar.gz diff --git a/.podman.metadata b/.podman.metadata index 530edd5..ae8e996 100644 --- a/.podman.metadata +++ b/.podman.metadata @@ -1,5 +1,5 @@ -50b67c1c8ce5d0de17fe840db33c504ed1a09f40 SOURCES/main-800d594.tar.gz 70b08b173bdf0d1325fce035c186b43085865587 SOURCES/podman-machine-cni-0749884.tar.gz d2be14e364fef2d95c61cdac528219548640f6d4 SOURCES/v0.1.0.tar.gz 4502491739693bd1b1d108d9af545f69a3bd424b SOURCES/v0.1.5.tar.gz 667dcf5bea5992e18963bac6b833053a0d8b1eaa SOURCES/v1.3.0.tar.gz +7c06114150ac3723425cd89137a8ed8e4adaaa3a SOURCES/v3.4-c15c154.tar.gz diff --git a/SPECS/podman.spec b/SPECS/podman.spec index ff94ce8..2d16ed4 100644 --- a/SPECS/podman.spec +++ b/SPECS/podman.spec @@ -13,8 +13,8 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl %endif %global import_path github.com/containers/podman -%global branch main -%global commit0 800d594afa160353cc7134ef912bf82f266a122c +%global branch v3.4 +%global commit0 c15c1540837b25305729bc72d61372098e204151 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global cataver 0.1.5 %global dnsnamever 1.3.0 @@ -23,10 +23,10 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl %global commit_mcni 0749884b8d1a455c68da30789e37811ec0809d51 %global shortcommit_mcni %(c=%{commit_mcni}; echo ${c:0:7}) - +Epoch: 1 Name: podman -Version: 4.0.0 -Release: 0.10%{?dist} +Version: 3.4.1 +Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 and GPLv3+ URL: https://%{name}.io/ @@ -76,7 +76,7 @@ Requires: (container-selinux if selinux-policy) Requires: slirp4netns >= 0.4.0-1 Requires: runc >= 1.0.0-57 Requires: fuse-overlayfs -Requires: %{name}-catatonit >= %{version}-%{release} +Requires: %{name}-catatonit >= %{epoch}:%{version}-%{release} Requires: oci-runtime %description @@ -97,7 +97,7 @@ manipulate images (but not containers) created by the other. %package docker Summary: Emulate Docker CLI using %{name} BuildArch: noarch -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release} Provides: docker = %{version}-%{release} %description docker @@ -119,7 +119,7 @@ variables, or in containers.conf. %package catatonit Summary: A signal-forwarding process manager for containers -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release} %description catatonit Catatonit is a /sbin/init program for use within containers. It @@ -146,7 +146,7 @@ file. Each CNI network will have its own dnsmasq instance. %package tests Summary: Tests for %{name} -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release} #Requires: bats (which RHEL8 doesn't have. If it ever does, un-comment this) Requires: nmap-ncat Requires: httpd-tools @@ -396,6 +396,82 @@ exit 0 %{_libexecdir}/%{name}/gvproxy %changelog +* Mon Oct 18 2021 Jindrich Novy - 1:3.4.1-3 +- fix also dependency for podman-catatonit +- Related: #2001445 + +* Mon Oct 18 2021 Jindrich Novy - 1:3.4.1-2 +- respect Epoch in subpackage dependencies +- Related: #2001445 + +* Fri Oct 15 2021 Jindrich Novy - 1:3.4.1-0.3 +- fix Release to denote this is not a development version +- Related: #2001445 + +* Fri Oct 15 2021 Jindrich Novy - 1:3.4.1-0.2 +- bump Epoch to preserve upgrade path +- Related: #2001445 + +* Wed Oct 13 2021 Jindrich Novy - 3.4.1-0.1 +- update to the latest content of https://github.com/containers/podman/tree/v3.4 + (https://github.com/containers/podman/commit/c15c154) +- Related: #2001445 + +* Wed Oct 13 2021 Jindrich Novy - 4.0.0-0.21 +- update to the latest content of https://github.com/containers/podman/tree/main + (https://github.com/containers/podman/commit/72e87c0) +- Related: #2001445 + +* Mon Oct 11 2021 Jindrich Novy - 4.0.0-0.20 +- update to the latest content of https://github.com/containers/podman/tree/main + (https://github.com/containers/podman/commit/ea86893) +- Related: #2001445 + +* Fri Oct 08 2021 Jindrich Novy - 4.0.0-0.19 +- update to the latest content of https://github.com/containers/podman/tree/main + (https://github.com/containers/podman/commit/14c0fcc) +- Related: #2001445 + +* Thu Oct 07 2021 Jindrich Novy - 4.0.0-0.18 +- update to the latest content of https://github.com/containers/podman/tree/main + (https://github.com/containers/podman/commit/bfb904b) +- Related: #2001445 + +* Wed Oct 06 2021 Jindrich Novy - 4.0.0-0.17 +- update to the latest content of https://github.com/containers/podman/tree/main + (https://github.com/containers/podman/commit/8bcc086) +- Related: #2001445 + +* Tue Oct 05 2021 Jindrich Novy - 4.0.0-0.16 +- update to the latest content of https://github.com/containers/podman/tree/main + (https://github.com/containers/podman/commit/c963a50) +- Related: #2001445 + +* Mon Oct 04 2021 Jindrich Novy - 4.0.0-0.15 +- update to the latest content of https://github.com/containers/podman/tree/main + (https://github.com/containers/podman/commit/b9d8c63) +- Related: #2001445 + +* Fri Oct 01 2021 Jindrich Novy - 4.0.0-0.14 +- update to the latest content of https://github.com/containers/podman/tree/main + (https://github.com/containers/podman/commit/317e20a) +- Related: #2001445 + +* Thu Sep 30 2021 Jindrich Novy - 4.0.0-0.13 +- update to the latest content of https://github.com/containers/podman/tree/main + (https://github.com/containers/podman/commit/b187dfe) +- Related: #2001445 + +* Wed Sep 29 2021 Jindrich Novy - 4.0.0-0.12 +- update to the latest content of https://github.com/containers/podman/tree/main + (https://github.com/containers/podman/commit/cd10304) +- Related: #2001445 + +* Mon Sep 27 2021 Jindrich Novy - 4.0.0-0.11 +- update to the latest content of https://github.com/containers/podman/tree/main + (https://github.com/containers/podman/commit/b60cff8) +- Related: #2001445 + * Fri Sep 24 2021 Jindrich Novy - 4.0.0-0.10 - update to the latest content of https://github.com/containers/podman/tree/main (https://github.com/containers/podman/commit/800d594)