From 223c899b1edad45ca3ba5226e31807aeda5d0d67 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Wed, 2 Dec 2020 14:26:45 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/podman.git#e795dbb09e8346fa973d7f172c4bc873a03b4f8c --- .gitignore | 8 ++++++++ podman.spec | 32 ++++++++++++++++++++++++++++---- sources | 4 ++-- 3 files changed, 38 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 6a1c92a..63d09a3 100644 --- a/.gitignore +++ b/.gitignore @@ -1424,3 +1424,11 @@ /podman-f6fb297.tar.gz /podman-c342583.tar.gz /podman-ca612a3.tar.gz +/podman-2438390.tar.gz +/podman-429d949.tar.gz +/dnsname-c654c95.tar.gz +/podman-ce45b71.tar.gz +/podman-c71ad9a.tar.gz +/podman-b2cd6e0.tar.gz +/podman-9c5fe95.tar.gz +/podman-d28874b.tar.gz diff --git a/podman.spec b/podman.spec index 2498e9b..077fd91 100644 --- a/podman.spec +++ b/podman.spec @@ -32,19 +32,19 @@ # To build a random user's fork/commit, comment out above line, # uncomment below line and replace the placeholders and commit0 below with the right info #%%global git0 https://github.com/$GITHUB_USER/$GITHUB_USER_REPO -%global commit0 ca612a3407eeecfedc38b629731f1e7a0105020f +%global commit0 d28874b2f4bc4f522ed2dc63412e9ddfea011fac %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global repo_plugins dnsname # https://github.com/containers/dnsname %global import_path_plugins %%{provider}.%{provider_tld}/%{project}/%{repo_plugins} %global git_plugins https://%{import_path_plugins} -%global commit_plugins a9c2a10a3a24e082996cf2d9edb1cee295651413 +%global commit_plugins c654c95366ac5f309ca3e5727c9b858864247328 %global shortcommit_plugins %(c=%{commit_plugins}; echo ${c:0:7}) # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v2.2.0-rc2 +%define built_tag v2.2.0 Name: podman %if 0%{?fedora} @@ -57,7 +57,7 @@ Version: 3.0.0 # N.foo if released, 0.N.foo if unreleased # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.foo -Release: 0.1.dev.git%{shortcommit0}%{?dist} +Release: 0.9.dev.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -624,6 +624,30 @@ exit 0 # rhcontainerbot account currently managed by lsm5 %changelog +* Wed Dec 2 2020 RH Container Bot - 2:3.0.0-0.9.dev.gitd28874b +- autobuilt d28874b + +* Wed Dec 2 2020 RH Container Bot - 2:3.0.0-0.8.dev.git9c5fe95 +- autobuilt 9c5fe95 + +* Tue Dec 1 2020 RH Container Bot - 2:3.0.0-0.7.dev.gitb2cd6e0 +- autobuilt b2cd6e0 + +* Tue Dec 1 2020 RH Container Bot - 2:3.0.0-0.6.dev.gitc71ad9a +- autobuilt c71ad9a + +* Tue Dec 1 2020 RH Container Bot - 2:3.0.0-0.5.dev.gitce45b71 +- autobuilt ce45b71 + +* Tue Dec 1 2020 Lokesh Mandvekar - 2:3.0.0-0.4.dev.git429d949 +- use podman-plugins / dnsname upstream v1.1.1 + +* Tue Dec 1 2020 RH Container Bot - 2:3.0.0-0.3.dev.git429d949 +- autobuilt 429d949 + +* Tue Dec 1 2020 RH Container Bot - 2:3.0.0-0.2.dev.git2438390 +- autobuilt 2438390 + * Tue Dec 1 2020 RH Container Bot - 2:3.0.0-0.1.dev.gitca612a3 - bump to 3.0.0 - autobuilt ca612a3 diff --git a/sources b/sources index 680d4b5..e61fe11 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (dnsname-a9c2a10.tar.gz) = 4e415890c550ef4452f318753bfedec7eec66ee61f9660e7fa4094d2048e60b48f4d514267483e77697b8febb6b640be7714cff1f089752596f214dd0d852868 -SHA512 (podman-ca612a3.tar.gz) = 9e17042ea654f8b3296731a1d0d40ba69d38f5ac0c21896dd7dc8c32fc90383ac2cbdb4430326dbf1de7e31521e79199a313690be336a719076833cf4b6142c9 +SHA512 (dnsname-c654c95.tar.gz) = 34c844ca3ebe24b069077836d27e828ebbfd61c13e0aa943838af9aae475258c3f02e7d1c5e61362cb6904287eee4e3fc85cc2879216e1a8e1142b69731926f0 +SHA512 (podman-d28874b.tar.gz) = 90fc29e6b1349cd6b56f786c8af572214225b4c407b720ebedcafc15735c1d9d4fe4dd6f085df833292cb5eee9e0576ab952c18af4e0542daeb68492ad46be5c