diff --git a/0001-PATCH-wafsamba-Fix-few-SyntaxWarnings-caused-by-regu.patch b/0001-PATCH-wafsamba-Fix-few-SyntaxWarnings-caused-by-regu.patch index 3b818993b12d576d088ccf10fd97c999930012bf..7742479d22d51969a1c232a6f24c25c155d80515 100644 --- a/0001-PATCH-wafsamba-Fix-few-SyntaxWarnings-caused-by-regu.patch +++ b/0001-PATCH-wafsamba-Fix-few-SyntaxWarnings-caused-by-regu.patch @@ -131,19 +131,6 @@ index ef632ba903369e4211991f17a3b204bcd96c3a2f..63e50567860ff890b00b0ce6c7607c91 if not m: conf.end_msg('not found', color='YELLOW') return -diff --git a/buildtools/wafsamba/samba_cross.py b/buildtools/wafsamba/samba_cross.py -index 8863c2c53e7d7dd9317c9233f0085ffd0eea6b2f..34793902fba884cf2d8358bf4315dc98027266b6 100644 ---- a/buildtools/wafsamba/samba_cross.py -+++ b/buildtools/wafsamba/samba_cross.py -@@ -77,7 +77,7 @@ def cross_answer(ca_file, msg): - f.close() - return (0, ans.strip("'")) - else: -- m = re.match('\(\s*(-?\d+)\s*,\s*\"(.*)\"\s*\)', ans) -+ m = re.match(r'\(\s*(-?\d+)\s*,\s*\"(.*)\"\s*\)', ans) - if m: - f.close() - return (int(m.group(1)), m.group(2)) diff --git a/buildtools/wafsamba/samba_headers.py b/buildtools/wafsamba/samba_headers.py index a268c011c5d8e406e0d763554c55668cfb5388bc..c8bee19010978a04460b0637fcc8fd484a699ea8 100644 --- a/buildtools/wafsamba/samba_headers.py diff --git a/download b/download index 3e0c528b6c0b8b122e900b43156b6dcd31ce58f7..6e9a3fa7c69e27b12b20cbe4587546c13a1d9183 100644 --- a/download +++ b/download @@ -1,2 +1,2 @@ -dd6d542dd9e05718540dacfea0af300d ldb-2.5.2.tar.asc -c7fc9d1d43b801d3932484b1de7442fe ldb-2.5.2.tar.gz +460602c0b3cae6261dd191111226964d ldb-2.6.1.tar.asc +3a5f54f511fb237b83e1f34e2c7e25cd ldb-2.6.1.tar.gz diff --git a/libldb.spec b/libldb.spec index 9c5f9583e9f2bab31bc26581c04d9609fefcae15..45637c8a08a5143c749c4ed5be1ac97aa546088c 100644 --- a/libldb.spec +++ b/libldb.spec @@ -21,13 +21,13 @@ %bcond_with python3 %endif -%global talloc_version 2.3.3 -%global tdb_version 1.4.6 -%global tevent_version 0.11.0 +%global talloc_version 2.3.4 +%global tdb_version 1.4.7 +%global tevent_version 0.13.0 Name: libldb -Version: 2.5.2 -Release: 2%{anolis_release}%{?dist} +Version: 2.6.1 +Release: 1%{anolis_release}%{?dist} Summary: A schema-less, ldap like, API and database Requires: libtalloc%{?_isa} >= %{talloc_version} Requires: libtdb%{?_isa} >= %{tdb_version} @@ -235,9 +235,12 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/_* %doc README_gcov.txt %changelog -* Fri Dec 30 2022 Zhao Hang - 2.5.2-2.0.1 +* Tue May 30 2023 Zhao Hang - 2.6.1-1.0.1 - Add doc sub package +* Mon Oct 24 2022 Andreas Schneider - 2.6.1-1 +- resolves: rhbz#2132052 - Update to version 2.6.1 + * Thu Aug 11 2022 Andreas Schneider - 2.5.2-2 - resolves: rhbz#2108998 - Rebuild to include python3-ldb-devel in CRB