From 2f149b48dc649a42ca53c132faafe33026fcf5df Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 30 2018 08:13:02 +0000
Subject: import podman-0.10.1.3-1.gitdb08685.el7


---

diff --git a/.gitignore b/.gitignore
index 701e7ce..4702259 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/cri-o-e0c89d8.tar.gz
-SOURCES/libpod-37a2afe.tar.gz
+SOURCES/cri-o-a30f93c.tar.gz
+SOURCES/libpod-db08685.tar.gz
diff --git a/.podman.metadata b/.podman.metadata
index 6d141f1..eecc9d1 100644
--- a/.podman.metadata
+++ b/.podman.metadata
@@ -1,2 +1,2 @@
-5cfbcf5f10f56ed34728dbd8ab801624be8a665d SOURCES/cri-o-e0c89d8.tar.gz
-9fb0ee9b0f8945c19a75f4e6c9bd1d78067ed642 SOURCES/libpod-37a2afe.tar.gz
+53e0c0d4e10030c0df6bc1be9065df02c0cf991d SOURCES/cri-o-a30f93c.tar.gz
+f22f77d1eab76e24e144a2ee85f516ca0f50ab7c SOURCES/libpod-db08685.tar.gz
diff --git a/SPECS/podman.spec b/SPECS/podman.spec
index 5eb58e7..2614362 100644
--- a/SPECS/podman.spec
+++ b/SPECS/podman.spec
@@ -8,9 +8,7 @@
 %global debug_package   %{nil}
 %endif
 
-# %if ! 0% {?gobuild:1}
 %define gobuild(o:) go build -tags="$BUILDTAGS selinux seccomp" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x %{?**};
-#% endif
 
 %global provider github
 %global provider_tld com
@@ -20,17 +18,17 @@
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path %{provider_prefix}
 %global git_podman https://%{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit 37a2afe8728f44f0b311ba26ad7162888fb3e00b
+%global commit db08685af57206c21fd3dd150ecb70d7147ce7f4
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 %global import_path_conmon github.com/kubernetes-sigs/cri-o
 %global git_conmon https://%{import_path_conmon}
-%global commit_conmon e0c89d8df1a23b3ff586e5baaa36a396ff4ca571
+%global commit_conmon a30f93ca229c7fc68fb1d8c7a3342de3c3f54ae5
 %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7})
 
 Name: podman
-Version: 0.9.2
-Release: 5.git%{shortcommit}%{?dist}
+Version: 0.10.1.3
+Release: 1.git%{shortcommit}%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0
 URL: %{git_podman}
@@ -41,12 +39,15 @@ Source1: %{git_conmon}/archive/%{commit_conmon}/cri-o-%{shortcommit_conmon}.tar.
 #ExclusiveArch:  %%{?go_arches:%%{go_arches}}%%{!?go_arches:%%{ix86} x86_64 aarch64 %%{arm}}
 ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64
 # If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-#BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-BuildRequires: golang
+%if 0%{?fedora}
+BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+%else
+BuildRequires: go-toolset-7-runtime
+BuildRequires: go-toolset-7-golang-bin
+%endif #fedora
 %if 0%{?fedora} || 0%{?rhel} <= 7
 BuildRequires: btrfs-progs-devel
 %endif
-BuildRequires: device-mapper-devel
 BuildRequires: glib2-devel
 BuildRequires: glibc-devel
 BuildRequires: glibc-static
@@ -193,7 +194,7 @@ ln -s ../../../../ src/%{import_path}
 popd
 ln -s vendor src
 export GOPATH=$(pwd)/_build:$(pwd)
-export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) containers_image_ostree_stub"
+export BUILDTAGS="selinux seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) containers_image_ostree_stub"
 
 GOPATH=$GOPATH go generate ./cmd/%{name}/varlink/...
 GOPATH=$GOPATH BUILDTAGS="$BUILDTAGS" %gobuild -o bin/%{name} %{import_path}/cmd/%{name}
@@ -263,6 +264,35 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_unitdir}/io.%{name}.socket
 
 %changelog
+* Thu Oct 18 2018 Lokesh Mandvekar <lsm5@redhat.com> - 0.10.1.3-1.gitdb08685
+- Resolves: #1640342 - update vendored buildah to allow building when there are
+containers running
+
+* Wed Oct 17 2018 Lokesh Mandvekar <lsm5@redhat.com> - 0.10.1.2-1.git2b4f8d1
+- Resolves: #1627891
+- bump to v0.10.1.2
+- built podman commit 2b4f8d1
+
+* Tue Oct 16 2018 Lokesh Mandvekar <lsm5@redhat.com> - 0.10.1.1-1.git4bea3e9
+- bump podman to v0.10.1.1
+- built podman commit 4bea3e9
+- built conmon from cri-o commit a30f93c
+
+* Wed Oct 03 2018 Frantisek Kluknavsky <fkluknav@redhat.com> - 0.9.3.1-4.gita3c4ce6
+- rebased cri-o to 1.11.6
+
+* Wed Oct 03 2018 Frantisek Kluknavsky <fkluknav@redhat.com> - 0.9.3.1-3.gita3c4ce6
+- rebase
+
+* Wed Sep 26 2018 Frantisek Kluknavsky <fkluknav@redhat.com> - 0.9.3.1-2.git1cd906d
+- rebase
+
+* Tue Sep 25 2018 Frantisek Kluknavsky <fkluknav@redhat.com> - 0.9.3-2.gita723353
+- rebase
+
+* Mon Sep 17 2018 Dan Walsh <dwalsh@redhat.com> - 0.9.2.1-1.git19cb754
+- Merge in fixes for podman build, to handle symbolic links and running sudo in Dockerfile
+
 * Mon Sep 17 2018 Frantisek Kluknavsky <fkluknav@redhat.com> - 0.9.2-5.git37a2afe
 - rebase to podman 0.9.2
 - rebase to cri-o 0.11.4