From de85642bc86d01bfbcaaecb467c1742a0fb1a526 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@redhat.com>
Date: Mon, 1 Jul 2024 13:36:07 +0200
Subject: [PATCH] resolves: RHEL-33616 - Update to version 2.9.1

---
 .gitignore  |  2 ++
 libldb.spec | 60 ++++++++++++++---------------------------------------
 sources     |  4 ++--
 3 files changed, 20 insertions(+), 46 deletions(-)

diff --git a/.gitignore b/.gitignore
index 32633cf..ac1dcb0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,3 +83,5 @@
 /ldb-2.8.0.tar.asc
 /ldb-2.9.0.tar.gz
 /ldb-2.9.0.tar.asc
+/ldb-2.9.1.tar.gz
+/ldb-2.9.1.tar.asc
diff --git a/libldb.spec b/libldb.spec
index c55d367..e46d852 100644
--- a/libldb.spec
+++ b/libldb.spec
@@ -1,5 +1,3 @@
-%if ((0%{?fedora} || 0%{?rhel} > 7 || 0%{?epel} > 6))
-
 # lmdb is not supported on 32 bit architectures
 %ifarch aarch64 ppc64le s390x x86_64
 %bcond_without lmdb
@@ -8,23 +6,12 @@
 #endif arch
 %endif
 
-%else
-%bcond_with lmdb
-#endif fedora || rhel || epel
-%endif
-
-%if 0%{?fedora} || 0%{?rhel} > 7
-%bcond_without python3
-%else
-%bcond_with python3
-%endif
-
 %global talloc_version 2.4.2
 %global tdb_version 1.4.10
 %global tevent_version 0.16.1
 
 Name: libldb
-Version: 2.9.0
+Version: 2.9.1
 Release: %autorelease
 Summary: A schema-less, ldap like, API and database
 Requires: libtalloc%{?_isa} >= %{talloc_version}
@@ -37,30 +24,25 @@ Source1: https://www.samba.org/ftp/ldb/ldb-%{version}.tar.asc
 # gpg2 --no-default-keyring --keyring ./ldb.keyring --recv-keys 9147A339719518EE9011BCB54793916113084025
 Source2: ldb.keyring
 
-# Patches
-
+BuildRequires: docbook-style-xsl
+BuildRequires: doxygen
 BuildRequires: gcc
+BuildRequires: gnupg2
+BuildRequires: libcmocka-devel
 BuildRequires: libtalloc-devel >= %{talloc_version}
 BuildRequires: libtdb-devel >= %{tdb_version}
 BuildRequires: libtevent-devel >= %{tevent_version}
+BuildRequires: libxslt
+BuildRequires: make
+BuildRequires: openldap-devel
+BuildRequires: popt-devel
+BuildRequires: python3-devel
+BuildRequires: python3-talloc-devel
+BuildRequires: python3-tdb
+BuildRequires: python3-tevent
 %if %{with lmdb}
 BuildRequires: lmdb-devel >= 0.9.16
 %endif
-BuildRequires: popt-devel
-BuildRequires: libxslt
-BuildRequires: docbook-style-xsl
-%if %{with python3}
-BuildRequires: python3-devel
-BuildRequires: python3-tdb
-BuildRequires: python3-talloc-devel
-BuildRequires: python3-tevent
-#endif with python
-%endif
-BuildRequires: doxygen
-BuildRequires: openldap-devel
-BuildRequires: libcmocka-devel
-BuildRequires: gnupg2
-BuildRequires: make
 
 Provides: bundled(libreplace)
 Obsoletes: python2-ldb < 2.0.5-1
@@ -99,7 +81,6 @@ Provides: pyldb-devel%{?_isa} = %{version}-%{release}
 Development files for the Python bindings for the LDB library.
 This package includes files that aren't specific to a Python version.
 
-%if %{with python3}
 %package -n python3-ldb
 Summary: Python bindings for the LDB library
 Requires: libldb%{?_isa} = %{version}-%{release}
@@ -119,17 +100,12 @@ Requires: python-ldb-devel-common%{?_isa} = %{version}-%{release}
 
 %description -n python3-ldb-devel
 Development files for the Python bindings for the LDB library
-#endif with python
-%endif
 
 %prep
 zcat %{SOURCE0} | gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} -
 %autosetup -n ldb-%{version} -p1
 
 %build
-# workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1217376
-export python_LDFLAGS=""
-
 %configure --disable-rpath \
            --disable-rpath-install \
            --bundled-libraries=NONE \
@@ -153,13 +129,11 @@ make %{?_smp_mflags} check
 %make_install
 
 # Install API docs
-cp -a apidocs/man/* $RPM_BUILD_ROOT/%{_mandir}
+cp -a apidocs/man/* %{buildroot}%{_mandir}
 
 # bug: remove manpage named after full file path
 # not needed with el8+ and fc28+
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/_*
-
-%ldconfig_scriptlets
+rm -f %{buildroot}%{_mandir}/man3/_*
 
 %files
 %dir %{_libdir}/ldb
@@ -205,7 +179,6 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/_*
 %{_includedir}/pyldb.h
 %{_mandir}/man*/Py*.gz
 
-%if %{with python3}
 %files -n python3-ldb
 %{python3_sitearch}/ldb.cpython-*.so
 %{_libdir}/libpyldb-util.cpython-*.so.2*
@@ -216,9 +189,8 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/_*
 %{_libdir}/libpyldb-util.cpython-*.so
 %{_libdir}/pkgconfig/pyldb-util.cpython-*.pc
 
+%ldconfig_scriptlets
 %ldconfig_scriptlets -n python3-ldb
-#endif with python
-%endif
 
 %changelog
 %autochangelog
diff --git a/sources b/sources
index f97ad99..1e7235a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (ldb-2.9.0.tar.gz) = b5cfbbcb2c35d6830bf1a7c85e1d4363728ae474504441add54c4c8569316b26aedbf6fb9f561ec4f187eb5a847ac76af07396e38d00e6f7632b63e02d7b64a1
-SHA512 (ldb-2.9.0.tar.asc) = b3dd7a38968fbd57b997931fb075b86a7d9b82c5192b106d14ee78769d5941c9ec591e9a195896db54b9b2fe0942b33d12524bc9c90d16f475a417073cdcd671
+SHA512 (ldb-2.9.1.tar.gz) = a7384d5b88b1b2edc1ac40f38f74b8b2eb403610d158c579a862007801586a4ad1ba11019737ecad8a83e8f2d1ae7ae16ec7e92c58f60feb2d6fed84c4212265
+SHA512 (ldb-2.9.1.tar.asc) = 72ba8ca064805f566f45945ac9d4bee16ca6b04f666d15a0108e7bdd01874752dd8cb2512497a797876a391d45e8ef54db4d51cb6e01da38d02c04082d567641