From e988e33251803ab339aa6e9104645f6c3b2709d7 Mon Sep 17 00:00:00 2001
From: Matúš Honěk <mhonek@redhat.com>
Date: Jun 13 2018 11:47:32 +0000
Subject: Make 389-ds-base depend on lib389 and remove duplicate provides


Moving -libs Requirement few lines down to reflect upstream SPEC file.

Resolves: #1573483

---

diff --git a/389-ds-base.spec b/389-ds-base.spec
index 577642a..e5fad03 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -50,7 +50,6 @@ URL:              http://www.port389.org
 Group:            System Environment/Daemons
 Conflicts:        selinux-policy-base < 3.9.8
 Conflicts:        freeipa-server < 4.0.3
-Requires:         %{name}-libs = %{version}-%{release}
 Obsoletes:        %{name} <= 1.4.0.9
 Provides:         ldif2ldbm >= 0
 
@@ -108,6 +107,9 @@ BuildRequires:    python3-devel
 # For cockpit
 BuildRequires:    rsync
 
+Requires:         %{name}-libs = %{version}-%{release}
+Requires:         python%{python3_pkgversion}-lib389 = %{version}-%{release}
+
 # this is needed for using semanage from our setup scripts
 Requires:         policycoreutils-python-utils
 Requires:         /usr/sbin/semanage
@@ -758,6 +760,9 @@ exit 0
 %doc README.md
 
 %changelog
+* Thu May 17 2018 Matus Honek <mhonek@redhat.com> - 1.4.0.10-3
+- Make 389-ds-base depend on lib389 and remove duplicate provides. (#1573483)
+
 * Fri Jun 8 2018 Mark Reynolds <mreynolds@redhat.com> - 1.4.0.10-2
 - Bump verision to 1.4.0.10-2
 - Remove reference ro stop-dirsrv from legacy tools
@@ -819,7 +824,6 @@ exit 0
 - Ticket 49665 - Upgrade script doesn't enable CRYPT password storage plug-in
 - Ticket 49665 - Upgrade script doesn't enable PBKDF2 password storage plug-in
 
->>>>>>> master
 * Tue May 15 2018 Mark Reynolds <mreynolds@redhat.com> - 1.4.0.9-2
 - Bump version to 1.4.0.9-2
 - Add openssl-perl requirement for new python installer