From 5b9f14b99cdf4ca870f97b828c28f38913492888 Mon Sep 17 00:00:00 2001
From: Simon Pichugin <spichugi@redhat.com>
Date: Wed, 17 Jul 2024 10:55:54 -0700
Subject: [PATCH] Fix vlvResult patch

Also fix libslapi definition and a comment typo

Resolves: RHEL-36474
---
 openldap.spec | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/openldap.spec b/openldap.spec
index caef68e..4a3cc16 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -17,7 +17,7 @@
 
 Name: openldap
 Version: 2.6.7
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: LDAP support libraries
 License: OLDAP-2.8
 URL: http://www.openldap.org/
@@ -179,6 +179,7 @@ pushd openldap-%{version}
 %if %{with servers}
 %patch -P10 -p1
 %endif
+%patch -P11 -p1
 
 # build smbk5pwd with other overlays
 ln -s ../../../contrib/slapd-modules/smbk5pwd/smbk5pwd.c servers/slapd/overlays
@@ -339,14 +340,10 @@ done
 pushd %{buildroot}%{_libdir}
 v=%{version}
 version=$(echo ${v%.[0-9]*})
-for lib in liblber libldap; do
+for lib in liblber libldap %{?with_servers:libslapi}; do
         rm -f ${lib}.so
         ln -s ${lib}.so.%{so_ver} ${lib}.so
 done
-%if %{with servers}
-rm -f libslapi.so
-ln -s libslapi.so.%{so_ver} libslapi.so
-%endif
 
 for lib in $(ls | grep libldap); do
     IFS='.'
@@ -362,7 +359,7 @@ for lib in $(ls | grep libldap); do
 done
 
 # Provide only libldap and copy it to libldap_r for both 2.4 and 2.6+ versions, make a versioned lib link
-# We increase it by 2 because libldap-2.4 has the 'so.2' major version on 2.4.59 (one of the last versions which is EOF)
+# We increase it by 2 because libldap-2.4 has the 'so.2' major version on 2.4.59 (one of the last versions which is EOL)
 gcc -shared -o "%{buildroot}%{_libdir}/libldap-2.4.so.${so_ver_short_2_4}" -Wl,--no-as-needed \
        -Wl,-soname -Wl,libldap-2.4.so.${so_ver_short_2_4} -L "%{buildroot}%{_libdir}" -Wl,-z,now -lldap
 gcc -shared -o "%{buildroot}%{_libdir}/libldap_r-2.4.so.${so_ver_short_2_4}" -Wl,--no-as-needed \
@@ -567,6 +564,10 @@ exit 0
 %endif
 
 %changelog
+* Thu Aug 15 2024 Simon Pichugin <spichugi@redhat.com> - 2.6.7-5
+- Fix vlvResult patch (RHEL-36474)
+- Fix libslapi definition and a comment typo
+
 * Thu Jul  4 2024 Troy Dawson <tdawson@redhat.com> - 2.6.7-4
 - Fix annocheck bind-now issue (RHEL-33514)
 - Fix vlvResult comment (RHEL-36474)