From 2173e021750efd901b9738a227992996d4c523e0a8e727ec936776a1d4e0b076 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Wed, 27 Mar 2019 15:13:10 +0000
Subject: [PATCH] Accepting request 688763 from devel:kubic

OBS-URL: https://build.opensuse.org/request/show/688763
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/podman?expand=0&rev=40
---
 libpod.conf    | 16 ++++++++++------
 podman.changes | 18 ++++++++++++++++++
 podman.spec    |  9 +++++----
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/libpod.conf b/libpod.conf
index 547a213..a13ea62 100644
--- a/libpod.conf
+++ b/libpod.conf
@@ -4,12 +4,6 @@
 # Default transport method for pulling and pushing for images
 image_default_transport = "docker://"
 
-# Paths to look for a valid OCI runtime (runc, runv, etc)
-runtime_path = [
-	     "/usr/bin/runc",
-	     "/usr/sbin/runc",
-]
-
 # Paths to look for the Conmon container manager binary
 conmon_path = [
 	    "/usr/lib/podman/bin/conmon",
@@ -84,3 +78,13 @@ pause_command = "/pause"
 
 # Default libpod support for container labeling
 # label=true
+
+# Default OCI runtime
+runtime = "runc"
+
+# Paths to look for a valid OCI runtime (runc, runv, etc)
+[runtimes]
+runc = [
+  "/usr/bin/runc",
+  "/usr/sbin/runc"
+]
diff --git a/podman.changes b/podman.changes
index e8e3c0b..efdce5d 100644
--- a/podman.changes
+++ b/podman.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Fri Mar 22 21:02:05 UTC 2019 - Flavio Castelli <fcastelli@suse.com>
+
+- Change default libpod.conf configuration file: use the runtimes
+  section to allow users to specify different OCI runtimes. This
+  allows user to choose which runtime to use on a per container
+  basis.
+
+-------------------------------------------------------------------
+Tue Mar 19 13:15:38 UTC 2019 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Add 'apparmor-parser' to list of requires (boo#1123387)
+
+-------------------------------------------------------------------
+Sat Mar 16 08:33:38 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
+
+- Scriptlets contain sh-compatible code, so drop -p /bin/bash.
+
 -------------------------------------------------------------------
 Fri Mar  8 09:47:25 UTC 2019 - Richard Brown <rbrown@suse.com>
 
diff --git a/podman.spec b/podman.spec
index 4a5d5fa..bde1546 100644
--- a/podman.spec
+++ b/podman.spec
@@ -54,6 +54,7 @@ BuildRequires:  golang(API) >= 1.11
 %ifarch ppc64le
 #!BuildIgnore: gcc-PIE
 %endif
+Requires:       apparmor-parser
 Requires:       cni
 Requires:       cni-plugins
 Requires:       iptables
@@ -184,17 +185,17 @@ install -D -m 0755 bin/conmon  %{buildroot}/%{_libexecdir}/podman/bin/conmon
 %config %{_sysconfdir}/cni/net.d/87-podman-bridge.conflist
 %license LICENSE
 
-%pre -p /bin/bash
+%pre
 %service_add_pre io.podman.service io.podman.socket
 
-%post -p /bin/bash
+%post
 %service_add_post io.podman.service io.podman.socket
 %tmpfiles_create %{_tmpfilesdir}/podman.conf
 
-%preun -p /bin/bash
+%preun
 %service_del_preun io.podman.service io.podman.socket
 
-%postun -p /bin/bash
+%postun
 %service_del_postun io.podman.service io.podman.socket
 
 %changelog