baude pushed to podman (f29). "Upstream 0.8.5 release"

Notification time stamped 2018-08-31 22:27:51 UTC

From 08f6564b8a6c9b37c0a60526ee0db325141722fe Mon Sep 17 00:00:00 2001
From: baude 
Date: Aug 31 2018 22:27:34 +0000
Subject: Upstream 0.8.5 release

---

diff --git a/.gitignore b/.gitignore
index 9b91a25..ec5b527 100644
--- a/.gitignore
+++ b/.gitignore
@@ -88,3 +88,4 @@
 /libpod-f38eb4f.tar.gz
 /libpod-9d09a4d.tar.gz
 /libpod-9f9b8cf.tar.gz
+/libpod-dc5a711.tar.gz
diff --git a/podman.spec b/podman.spec
index d0792cb..46788f4 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://%%7Bprovider%7D.%%7Bprovider_tld%7D/%%7Bproject%7D/%%7Brepo%7D
-%global commit0 9f9b8cffe5231e828a26b5bbec93bd474370c9d9
+%global commit0 dc5a711fb6368ce7b817b9c48e5c0102348df29c
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})

Name: podman
@@ -35,8 +35,8 @@ Name: podman
 %if 0%{?fedora} > 28
 Epoch: 1
 %endif
-Version: 0.8.4
-Release: 2.git%{shortcommit0}%{?dist}
+Version: 0.8.5
+Release: 1.git%{shortcommit0}%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0
 URL: %{git_podman}
@@ -67,7 +67,6 @@ Requires: containernetworking-plugins >= 0.7.3-2
 Requires: iptables
 Requires: nftables
 Requires: atomic-registries
-Requires: oci-systemd-hook
 Requires: conmon
 Recommends: container-selinux
 Recommends: slirp4netns
@@ -540,6 +539,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %endif

%changelog
+* Fri Aug 31 2018 baude  - 0.8.5-1.gitdc5a711
+- Upstream 0.8.5 release
+
 * Thu Aug 30 2018 Lokesh Mandvekar  - 1:0.8.4-2.git9f9b8cf
 - correct min dep on containernetworking-plugins
 - update bundled provides
diff --git a/rootless.patch b/rootless.patch
deleted file mode 100644
index aac01b3..0000000
--- a/rootless.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/cmd/podman/libpodruntime/runtime.go b/cmd/podman/libpodruntime/runtime.go
-index 9d1347cc..f1f2b963 100644
---- a/cmd/podman/libpodruntime/runtime.go
-+++ b/cmd/podman/libpodruntime/runtime.go
-@@ -105,6 +105,10 @@ func GetRuntimeWithStorageOpts(c *cli.Context, storageOpts *storage.StoreOptions
- 
- 	if c.GlobalIsSet("cgroup-manager") {
- 		options = append(options, libpod.WithCgroupManager(c.GlobalString("cgroup-manager")))
-+	} else {
-+		if rootless.IsRootless() {
-+			options = append(options, libpod.WithCgroupManager("cgroupfs"))
-+		}
- 	}
- 
- 	// TODO flag to set libpod static dir?
diff --git a/sources b/sources
index 6f64d4e..a38945f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libpod-9f9b8cf.tar.gz) = 85b25cc960451727002220e4888cd70cec98644b75f388bc36f0777146c8d36fb9fed66dd58a82622c3e5bbc9da881f949b98d8b2527630e94db3d140f8e9ec4
+SHA512 (libpod-dc5a711.tar.gz) = 2fa8df74bbf4a04b7dda7be87eb000126c2a49ae1bcd6cc4200fb28a57b9df482475169df5e31ce2dd81ac4cddf0291c8b41d39e50188d73c848cf180c78ede4

https://src.fedoraproject.org/rpms/podman/c/08f6564b8a6c9b37c0a60526ee0db325...