From fae80308f85f6059573c28073ef3c59c8c1866d7 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 27 2021 05:28:52 +0000 Subject: import podman-3.3.1-3.module+el8.5.0+12391+32580560 --- diff --git a/.gitignore b/.gitignore index 7dd18eb..5f24602 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ SOURCES/podman-machine-cni-afab2d8.tar.gz SOURCES/v0.1.0.tar.gz SOURCES/v0.1.5.tar.gz SOURCES/v1.3.0.tar.gz -SOURCES/v3.3.0.tar.gz +SOURCES/v3.3-d09259a.tar.gz diff --git a/.podman.metadata b/.podman.metadata index ff2f163..dd564bf 100644 --- a/.podman.metadata +++ b/.podman.metadata @@ -2,4 +2,4 @@ d2be14e364fef2d95c61cdac528219548640f6d4 SOURCES/v0.1.0.tar.gz 4502491739693bd1b1d108d9af545f69a3bd424b SOURCES/v0.1.5.tar.gz 667dcf5bea5992e18963bac6b833053a0d8b1eaa SOURCES/v1.3.0.tar.gz -df5d73b54a7009a0cb19d8db760b5c4b7829612a SOURCES/v3.3.0.tar.gz +860e8cce38ff643714fa24ac9da7e914f9888ea8 SOURCES/v3.3-d09259a.tar.gz diff --git a/SPECS/podman.spec b/SPECS/podman.spec index 3e4f49a..fe0076f 100644 --- a/SPECS/podman.spec +++ b/SPECS/podman.spec @@ -17,7 +17,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl %global import_path github.com/containers/podman %global branch v3.3 -%global commit0 39cab790cc90c77d4b4a156f5f885077b267cbd9 +%global commit0 d09259a1a754ab08c74b13272882a89b5c736e88 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global cataver 0.1.5 %global dnsnamever 1.3.0 @@ -28,17 +28,16 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl Name: podman -Version: 3.3.0 -Release: 8%{?dist} +Version: 3.3.1 +Release: 3%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 and GPLv3+ URL: https://%{name}.io/ -#%%if 0%%{?branch:1} -#Source0: https://%%{import_path}/tarball/%%{commit0}/%%{branch}-%%{shortcommit0}.tar.gz -#%%else -#%Source0: https://%%{import_path}/archive/%%{commit0}/%%{name}-%%{version}-%%{shortcommit0}.tar.gz -#%%endif -Source0: https://%{import_path}/archive/v%{version}.tar.gz +%if 0%{?branch:1} +Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz +%else +Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz +%endif Source1: https://github.com/openSUSE/catatonit/archive/v%{cataver}.tar.gz Source2: https://github.com/containers/dnsname/archive/v%{dnsnamever}.tar.gz Source3: https://github.com/containers/%{name}-machine-cni/archive/%{commit_mcni}/%{name}-machine-cni-%{shortcommit_mcni}.tar.gz @@ -69,7 +68,7 @@ BuildRequires: automake BuildRequires: file BuildRequires: gcc BuildRequires: libtool -Requires: containers-common >= 0.1.29-3 +Requires: containers-common >= 2:1-2 Requires: containernetworking-plugins >= 0.9.1-1 Requires: iptables Requires: nftables @@ -175,12 +174,11 @@ gvisor-tap-vsock brings a configurable DNS server and dynamic port forwarding. %prep -#%%if 0%%{?branch:1} -#%%autosetup -Sgit -n containers-%%{name}-%%{shortcommit0} -#%%else -#%%autosetup -Sgit -n %%{name}-%%{commit0} -#%%endif -%autosetup -Sgit -n %{name}-%{version} +%if 0%{?branch:1} +%autosetup -Sgit -n containers-%{name}-%{shortcommit0} +%else +%autosetup -Sgit -n %{name}-%{commit0} +%endif tar fx %{SOURCE1} tar fx %{SOURCE2} tar fx %{SOURCE3} @@ -400,6 +398,20 @@ exit 0 %{_libexecdir}/%{name}/%{name}-gvproxy %changelog +* Thu Aug 26 2021 Jindrich Novy - 3.3.1-3 +- update to the latest content of https://github.com/containers/podman/tree/v3.3 + (https://github.com/containers/podman/commit/d09259a) +- Related: #1934415 + +* Wed Aug 25 2021 Jindrich Novy - 3.3.1-2 +- amend containers-common dependency +- Related: #1934415 + +* Wed Aug 25 2021 Jindrich Novy - 3.3.1-1 +- update to the latest content of https://github.com/containers/podman/tree/v3.3 + (https://github.com/containers/podman/commit/8809aed) +- Related: #1934415 + * Tue Aug 17 2021 Lokesh Mandvekar - 3.3.0-8 - Bump podman to v3.3.0 - Related: #1966538