From 3cb42aa126eb2cf9f8e58e4f7d96e421bbddbb4a Mon Sep 17 00:00:00 2001
From: panxiaohe <panxh.life@foxmail.com>
Date: Sat, 8 Jan 2022 17:28:14 +0800
Subject: [PATCH] change bdb to mdb for ldap_test and defult_pw_test

---
 change-bdb-to-mdb-for-slapd-test.patch | 25 +++++++++++++++++++++++++
 libuser.spec                           | 18 ++++++++++--------
 2 files changed, 35 insertions(+), 8 deletions(-)
 create mode 100644 change-bdb-to-mdb-for-slapd-test.patch

diff --git a/change-bdb-to-mdb-for-slapd-test.patch b/change-bdb-to-mdb-for-slapd-test.patch
new file mode 100644
index 0000000..a849caa
--- /dev/null
+++ b/change-bdb-to-mdb-for-slapd-test.patch
@@ -0,0 +1,25 @@
+From c8f905ae72bbcc944f11050a59abb3f4739e5e45 Mon Sep 17 00:00:00 2001
+From: panxiaohe <panxiaohe@huawei.com>
+Date: Sat, 8 Jan 2022 17:19:03 +0800
+Subject: [PATCH] change bdb to mdb for slapd test
+
+---
+ tests/slapd.conf.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/slapd.conf.in b/tests/slapd.conf.in
+index 06ef10d..8e49a36 100644
+--- a/tests/slapd.conf.in
++++ b/tests/slapd.conf.in
+@@ -10,7 +10,7 @@ pidfile @WORKDIR@/slapd.pid
+ TLSCertificateFile @WORKDIR@/key.pem
+ TLSCertificateKeyFile @WORKDIR@/key.pem
+ 
+-database bdb
++database mdb
+ suffix "dc=libuser"
+ rootdn "cn=Manager,dc=libuser"
+ rootpw {SSHA}ABgelmLFZQ/OJzVEp3OM5MzWQ9rt3b4F
+-- 
+1.8.3.1
+
diff --git a/libuser.spec b/libuser.spec
index be92b5b..444e6b8 100644
--- a/libuser.spec
+++ b/libuser.spec
@@ -1,13 +1,14 @@
 Name:    libuser
 Version: 0.63
-Release: 1
+Release: 2
 Summary: A user and group account administration library
 License: LGPLv2+
 URL:     https://pagure.io/libuser
 Source:  http://releases.pagure.org/libuser/libuser-%{version}.tar.xz
 
-Patch0: %{url}/pull-request/49.patch#/libuser-0.63-PR49_add_yescrypt.patch
+Patch0: libuser-0.63-PR49_add_yescrypt.patch
 Patch1: libuser-0.63-downstream_test_xcrypt.patch
+Patch2: change-bdb-to-mdb-for-slapd-test.patch
 
 BuildRequires: cyrus-sasl-devel, nscd, linuxdoc-tools, pam-devel, popt-devel, gcc
 BuildRequires: libselinux-devel, openldap-devel, python3-devel, glib2-devel
@@ -46,9 +47,7 @@ Requires:       man, info
 Man pages and other related documents for %{name}
 
 %prep
-%setup -qn libuser-%{version}
-%patch0 -p1
-%patch1 -p1
+%autosetup -n libuser-%{version} -p1
 
 %build
 ./autogen.sh
@@ -62,12 +61,12 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' || :
 %find_lang %{name}
 
 %check
-LC_ALL=C.UTF-8 make -C python3 check \
-	|| { cat python3/test-suite.log; false; }
+%make_build check || { cat test-suite.log; false; }
+
 LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_prefix}/%{_lib}:${LD_LIBRARY_PATH}
 export LD_LIBRARY_PATH
 cd $RPM_BUILD_ROOT/%{python3_sitearch}
-LC_ALL=C.UTF-8 python3 -c "import libuser"
+python3 -c "import libuser"
 
 %post
 /sbin/ldconfig
@@ -103,6 +102,9 @@ LC_ALL=C.UTF-8 python3 -c "import libuser"
 %{_mandir}/man5/*
 
 %changelog
+* Sat Jan 8 2022 panxiaohe <panxiaohe@huawei.com> - 0.63-2
+- change bdb to mdb for ldap_test and defult_pw_test
+
 * Sat Nov 27 2021 fuanan <fuanan3@huawei.com> - 0.63-1
 - update version to 0.63