From 564901418b15797798ad17ae08e26b75732a2b58 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jan 31 2019 18:58:59 +0000
Subject: import podman-0.12.1.2-2.git9551f6b.el7


---

diff --git a/.gitignore b/.gitignore
index de53295..d138b88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 SOURCES/cri-o-464dba6.tar.gz
-SOURCES/libpod-594495d.tar.gz
+SOURCES/libpod-9551f6b.tar.gz
diff --git a/.podman.metadata b/.podman.metadata
index 92192e7..cea278a 100644
--- a/.podman.metadata
+++ b/.podman.metadata
@@ -1,2 +1,2 @@
 df547f025f22dd497230d39527e7d584b53b7f6f SOURCES/cri-o-464dba6.tar.gz
-1eba58550111febad9c0f85e5028802fe56f0065 SOURCES/libpod-594495d.tar.gz
+935d80f0a61d6064abc3b00e58262188a65992c5 SOURCES/libpod-9551f6b.tar.gz
diff --git a/SPECS/podman.spec b/SPECS/podman.spec
index 57542bf..27c598c 100644
--- a/SPECS/podman.spec
+++ b/SPECS/podman.spec
@@ -18,7 +18,7 @@
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path %{provider_prefix}
 %global git_podman https://%{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit 594495db2637a6e485fffd8aa57c193244e16578
+%global commit 9551f6bb379d4af56dfb63ddf0f3682e40a6694e
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 %global import_path_conmon github.com/kubernetes-sigs/cri-o
@@ -27,8 +27,8 @@
 %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7})
 
 Name: podman
-Version: 0.11.1.1
-Release: 3.git%{shortcommit}%{?dist}
+Version: 0.12.1.2
+Release: 2.git%{shortcommit}%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0
 URL: %{git_podman}
@@ -37,13 +37,13 @@ Source1: %{git_conmon}/archive/%{commit_conmon}/cri-o-%{shortcommit_conmon}.tar.
 
 # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
 #ExclusiveArch:  %%{?go_arches:%%{go_arches}}%%{!?go_arches:%%{ix86} x86_64 aarch64 %%{arm}}
-ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 
+ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64
 # If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?centos}
 BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
 %else
-BuildRequires: go-toolset-7-runtime
-BuildRequires: go-toolset-7-golang-bin
+BuildRequires: go-toolset-1.10
+#BuildRequires: openssl-devel
 %endif #fedora
 %if 0%{?fedora} || 0%{?rhel} <= 7
 BuildRequires: btrfs-progs-devel
@@ -59,7 +59,6 @@ BuildRequires: libgpg-error-devel
 BuildRequires: libseccomp-devel
 BuildRequires: libselinux-devel
 BuildRequires: pkgconfig
-BuildRequires: openssl-devel
 Requires: runc
 Requires: skopeo-containers >= 0.1.29-3
 # can't use default conmon right now, so we ship our own
@@ -191,7 +190,7 @@ executing %{name} commands, it also creates links between all Docker CLI man
 pages and %{name}.
 
 # Go Toolset
-%{?enable_gotoolset7}
+%{?enable_gotoolset110}
 
 %prep
 %autosetup -Sgit -n %{repo}-%{commit}
@@ -250,6 +249,9 @@ install -p -m 755 cri-o-%{commit_conmon}/bin/conmon %{buildroot}%{_libexecdir}/%
 
 rm -rf %{buildroot}/src/github.com/containers/*
 
+#https://bugzilla.redhat.com/show_bug.cgi?id=1657303 varlink not in rhel7
+rm -f %{buildroot}/%{_unitdir}/io.%{name}.service %{buildroot}/%{_unitdir}/io.%{name}.socket
+
 %check
 %if 0%{?with_check}
 ln -s ./ ./vendor/src # ./vendor/src -> ./vendor
@@ -279,16 +281,20 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist
 %{_datadir}/containers/%{repo}.conf
 %{_prefix}/lib/tmpfiles.d/%{name}.conf
-%{_unitdir}/io.%{name}.service
-%{_unitdir}/io.%{name}.socket
 
 %files docker
 %{_bindir}/docker
 %{_mandir}/man1/docker*.1*
 
 %changelog
-* Fri Nov 30 2018 Johnny Hughes <johnny@centos.org>
-- Manual CentOS Debranding
+* Fri Dec 14 2018 Frantisek Kluknavsky <fkluknav@redhat.com> - 0.12.1.2-2.git9551f6b
+- rebase
+
+* Mon Dec 10 2018 Frantisek Kluknavsky <fkluknav@redhat.com> - 0.11.1.1-5.git594495d
+- varlink not in rhel7, remove unitfiles. https://bugzilla.redhat.com/show_bug.cgi?id=1657303
+
+* Wed Nov 21 2018 Frantisek Kluknavsky <fkluknav@redhat.com> - 0.11.1.1-4.git594495d
+- openssl-devel needed only with scl go toolset
 
 * Thu Nov 15 2018 Lokesh Mandvekar <lsm5@redhat.com> - 0.11.1.1-3.git594495d
 - correctly generate debuginfo by updating gobuild def