From e56ad94ef76ef57b6ea879b5dfa1582e0c5bd56a Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Sun, 28 Oct 2018 18:45:03 -0400
Subject: [PATCH] podman-1:0.10.2-1.dev.git4955572

- Resolves: #1643744 - build podman with ostree support
- bump to v0.10.2
- built commit 4955572

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 .gitignore  |  1 +
 podman.spec | 18 +++++++++++-------
 sources     |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2d3af7e..4a6b338 100644
--- a/.gitignore
+++ b/.gitignore
@@ -107,3 +107,4 @@
 /libpod-da5c894.tar.gz
 /cri-o-a30f93c.tar.gz
 /libpod-db08685.tar.gz
+/libpod-4955572.tar.gz
diff --git a/podman.spec b/podman.spec
index 699e6fa..6ee4d9c 100644
--- a/podman.spec
+++ b/podman.spec
@@ -26,7 +26,7 @@
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path %{provider_prefix}
 %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit0 db08685af57206c21fd3dd150ecb70d7147ce7f4
+%global commit0 49555721ec84ca630e8fbbf32a400e523c477439
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 %global import_path_conmon github.com/kubernetes-sigs/cri-o
@@ -42,8 +42,8 @@ Epoch: 1
 %else
 Epoch: 0
 %endif
-Version: 0.10.1.3
-Release: 3.dev.git%{shortcommit0}%{?dist}
+Version: 0.10.2
+Release: 1.dev.git%{shortcommit0}%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0
 URL: https://podman.io/
@@ -182,7 +182,6 @@ Provides: bundled(golang(k8s.io/client-go)) = 7cd1d3291b7d9b1e2d54d4b69eb65995ea
 Provides: bundled(golang(k8s.io/kube-openapi)) = 275e2ce91dec4c05a4094a7b1daee5560b555ac9
 Provides: bundled(golang(k8s.io/utils)) = 258e2a2fa64568210fbd6267cf1d8fd87c3cb86e
 
-
 %description
 %{summary}
 %{repo} provides a library for applications looking to use
@@ -412,8 +411,8 @@ mkdir -p src/%{provider}.%{provider_tld}/%{project}
 ln -s ../../../../ src/%{import_path}
 popd
 ln -s vendor src
-export GOPATH=$(pwd)/_build:$(pwd):%{gopath}
-export BUILDTAGS="varlink selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) exclude_graphdriver_devicemapper"
+export GOPATH=$(pwd)/_build:$(pwd)
+export BUILDTAGS="varlink seccomp exclude_graphdriver_devicemapper $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) $(hack/ostree_tag.sh) $(hack/selinux_tag.sh)"
 %gogenerate ./cmd/%{name}/varlink/...
 %gobuild -o bin/%{name} %{import_path}/cmd/%{name}
 
@@ -425,7 +424,7 @@ mkdir -p src/%{provider}.%{provider_tld}/{kubernetes-sigs,opencontainers}
 ln -s $(dirs +1 -l) src/%{import_path_conmon}
 popd
 ln -s vendor src
-export GOPATH=$(pwd)/_output:$(pwd):%{gopath}
+export GOPATH=$(pwd)/_output:$(pwd)
 export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) containers_image_ostree_stub"
 BUILDTAGS=$BUILDTAGS make -C conmon
 popd
@@ -580,6 +579,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %endif
 
 %changelog
+* Sun Oct 28 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1:0.10.2-1.dev.git4955572
+- Resolves: #1643744 - build podman with ostree support
+- bump to v0.10.2
+- built commit 4955572
+
 * Fri Oct 19 2018 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1:0.10.1.3-3.dev.gitdb08685
 - consistent epoch:version-release in changelog
 
diff --git a/sources b/sources
index 80853bd..2691006 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (cri-o-a30f93c.tar.gz) = 8bfa291fe3720259b63abaae5b0e50574a3437e1742c84fca36ff325d046ddd81a406a26fe0a3c4760b4c69a7e065a9b1ac550f2e061b45aadc7faf4702b798d
-SHA512 (libpod-db08685.tar.gz) = f02cb70238e46b9da1a0eced1343746fb9a1f380c130be02c8f86a648786d0a71447fb0b97bd0fe65a7828541f3d35c247c1b31aaf42f96fdfc0ebcc2a852108
+SHA512 (libpod-4955572.tar.gz) = 3d5a75f677005f88ce2062cbf6e1fc3cfd053ca6cb2e762cfc16a0ffcce156462f434002bda966dcb854c138f33370512759b2be718831949387bc2a1b64db4d