From bbef41cdf976566b8858ec721f886d1b4d2811f6 Mon Sep 17 00:00:00 2001
From: Petr Šabata <contyk@redhat.com>
Date: Jun 16 2017 12:55:58 +0000
Subject: Include cyrus-sasl and fix openldap API


cyrus-sasl no longer depends on initscripts, making this possible.

Signed-off-by: Petr Šabata <contyk@redhat.com>

---

diff --git a/base-runtime.yaml b/base-runtime.yaml
index 283bd9e..11cca29 100644
--- a/base-runtime.yaml
+++ b/base-runtime.yaml
@@ -108,7 +108,8 @@ data:
             # curl
             curl, libcurl, libcurl-devel,
             # cyrus-sasl
-            cyrus-sasl-gs2, cyrus-sasl-gssapi, cyrus-sasl-ldap, cyrus-sasl-lib,
+            cyrus-sasl, cyrus-sasl-devel, cyrus-sasl-gs2,
+            cyrus-sasl-gssapi, cyrus-sasl-ldap, cyrus-sasl-lib,
             cyrus-sasl-md5, cyrus-sasl-ntlm, cyrus-sasl-plain,
             cyrus-sasl-scram,
             # dbus
@@ -463,7 +464,7 @@ data:
             # ocaml-srpm-macros
             ocaml-srpm-macros,
             # openldap
-            openldap, openldap-clients,
+            openldap, openldap-clients, openldap-devel,
             # openssl
             openssl, openssl-devel, openssl-libs, openssl-static,
             # os-prober
@@ -587,7 +588,7 @@ data:
             # cryptsetup
             cryptsetup-python,
             # cyrus-sasl
-            cyrus-sasl, cyrus-sasl-devel, cyrus-sasl-sql,
+            cyrus-sasl-sql,
             # dbus
             dbus-x11,
             # dracut
@@ -663,7 +664,7 @@ data:
             lvm2-cluster-standalone, lvm2-dbusd, lvm2-lockd,
             lvm2-python-libs,
             # openldap
-            openldap-devel, openldap-servers,
+            openldap-servers,
             # openssl
             openssl-perl,
             # pyparsing