From 48f1131fcff886d6cd36d89e97ed90d109851223 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 9 Jul 2019 18:46:17 +0530 Subject: [PATCH] podman-2:1.4.5-0.2.dev.gitcea0e93 - Resolves: #1727933 - containers-monuts.conf.5 moved to containers-common Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + podman.spec | 8 ++++++-- sources | 3 +-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 490e540..de74886 100644 --- a/.gitignore +++ b/.gitignore @@ -271,3 +271,4 @@ /libpod-7c4e444.tar.gz /libpod-0906b32.tar.gz /libpod-f7407f2.tar.gz +/libpod-cea0e93.tar.gz diff --git a/podman.spec b/podman.spec index 45cef89..810ed62 100644 --- a/podman.spec +++ b/podman.spec @@ -27,7 +27,7 @@ %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 f7407f2eb512e1407f8281009eb829f37405119b +%global commit0 cea0e93a658f10cc46b56cb9b00ac8b824bc8b02 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global import_path_conmon github.com/containers/conmon @@ -42,7 +42,7 @@ Epoch: 2 Version: 1.4.5 # Rawhide almost always ships unreleased builds, # so release tag should be of the form 0.N.blahblah -Release: 0.1.dev.git%{shortcommit0}%{?dist} +Release: 0.2.dev.git%{shortcommit0}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: https://%{name}.io/ @@ -415,6 +415,7 @@ Man pages for the %{name} commands %prep %autosetup -Sgit -n %{repo}-%{commit0} +rm -rf docs/containers-mounts.conf.5.md # untar cri-o tar zxf %{SOURCE1} @@ -591,6 +592,9 @@ exit 0 %endif %changelog +* Tue Jul 09 2019 Lokesh Mandvekar - 2:1.4.5-0.2.dev.gitcea0e93 +- Resolves: #1727933 - containers-monuts.conf.5 moved to containers-common + * Sun Jul 07 2019 Lokesh Mandvekar - 2:1.4.5-0.1.dev.gitf7407f2 - bump to v1.4.5-dev - use new name for go-md2man diff --git a/sources b/sources index 5a575ca..98b449f 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ SHA512 (conmon-5995229.tar.gz) = 9b739acdf6ba4ec24fa9e2ca60843e236a93f7b641b202459d0efde49928a3f803bc2fab6c626ea56bd5f34ef079f6f3123abd5660c9cbc1de9cc5b4648f8f51 -SHA512 (libpod-0906b32.tar.gz) = c519ad2011967450ba325eb9967042cb1069216f4a086e730c793cbb2a88170ddf0fe16b5d1883432329ad5147acbf9e55e7db3c5f94c5b53ff2148a6154ee93 -SHA512 (libpod-f7407f2.tar.gz) = 6fe9c08ca0711c9875f89193888bf76102d6534ec9642e0dd3bea9d6ec45c143f6aec35dfa03615da9a9c855efbcbce54f5cea2af6724cd1971c58f877ea273d +SHA512 (libpod-cea0e93.tar.gz) = 0daff588e9de2a99d35a06222b11f4a140439dcd0216e1dbd46a6c6fd7adabd15b0f73d63b895ab2e824fb5fbdcc8f9875b9b60fbde8b6b100dfeb99db158865