From cea7490e284791cd90b6acccbb4959a7213a81a4 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Apr 03 2018 12:20:29 +0000 Subject: Add proper version of conmon --- diff --git a/.gitignore b/.gitignore index 6656804..a94601b 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /libpod-b47fc0d.tar.gz /libpod-57b403e.tar.gz /libpod-db6bf9e.tar.gz +/cri-o-6a018de.tar.gz diff --git a/podman.spec b/podman.spec index 5b38c72..7838289 100644 --- a/podman.spec +++ b/podman.spec @@ -46,12 +46,12 @@ %global import_path_conmon github.com/kubernetes-incubator/cri-o %global git_conmon https://%{import_path_conmon} -%global commit_conmon 712f3b8cf14cbbac298f3ccc020677ac2a65fa75 +%global commit_conmon 6a018deb09e704e24ae8ff9d7c79ca8aa650c04c %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman Version: 0.3.5 -Release: 1.git%{shortcommit}%{?dist} +Release: 2.git%{shortcommit}%{?dist} Summary: Manage Pods, Containers and Container Images License: ASL 2.0 URL: %{git_podman} @@ -487,6 +487,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Tue Apr 3 2018 Dan Walsh - 0.3.5-2.git712f3b8cf14 +- Add proper version of conmon + * Thu Mar 29 2018 baude - 0.3.5-1.git712f3b8cf14 - Upstream release 0.3.5 diff --git a/sources b/sources index e46c6b5..3bfbadd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (cri-o-712f3b8.tar.gz) = 46f9cf6b2796b512eef15adf052842b50021ce07a8bb51bb6494698321e317d782f1978032e9cad0d836bc951ff61bfc778c6c57506475975acc0eac236fd354 SHA512 (libpod-db6bf9e.tar.gz) = 489d9d5fe3d62a2307f0d06e8781305130d0d6fbcc2a14e28e0c6db4ef07acf402895bd88340fe5863332ae717fc36d220041816079ef9eeb97129f133785591 +SHA512 (cri-o-6a018de.tar.gz) = fadce72967c78afd2c711907f48bdfdac908eaf9a6d09fbb03e4d0aa8613c13b4080257ff5d4f4ac6246f3e98df10c0e083182f91f438749cd61a55fa4bb5152