diff --git a/.gitignore b/.gitignore index 0aabaee..d994771 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/talloc-2.2.0.tar.gz +SOURCES/talloc-2.3.1.tar.gz diff --git a/.libtalloc.metadata b/.libtalloc.metadata index 61b7f7e..a4b60a6 100644 --- a/.libtalloc.metadata +++ b/.libtalloc.metadata @@ -1 +1 @@ -d806e2e4e9b973e8ab6521d1dd20a03abae32c99 SOURCES/talloc-2.2.0.tar.gz +1ff430a62264b29efac39a3fa26290586c019800 SOURCES/talloc-2.3.1.tar.gz diff --git a/SOURCES/py3_abi.patch b/SOURCES/py3_abi.patch deleted file mode 100644 index 857fb9d..0000000 --- a/SOURCES/py3_abi.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 80be2141ffde6270f71f3f4ed4300762f8765c80 Mon Sep 17 00:00:00 2001 -From: Isaac Boukris -Date: Mon, 25 Nov 2019 13:16:42 +0100 -Subject: [PATCH] ABI: add .PY3 alias to py{talloc,ldb} libs for backward - compatibility - -Signed-off-by: Isaac Boukris ---- - buildtools/wafsamba/samba_abi.py | 8 ++++++++ - 1 file changed, 8 insertions(+) - -Index: talloc-2.2.0/buildtools/wafsamba/samba_abi.py -=================================================================== ---- talloc-2.2.0.orig/buildtools/wafsamba/samba_abi.py -+++ talloc-2.2.0/buildtools/wafsamba/samba_abi.py -@@ -172,6 +172,10 @@ def abi_write_vscript(f, libname, curren - version - """ - -+ alias = None -+ if libname.startswith('PY') and libname.endswith('UTIL'): -+ alias = libname + '.PY3' -+ - invmap = {} - for s in symmap: - invmap.setdefault(symmap[s], []).append(s) -@@ -180,6 +184,8 @@ def abi_write_vscript(f, libname, curren - versions = sorted(versions, key=version_key) - for k in versions: - symver = "%s_%s" % (libname, k) -+ if alias: -+ symver = "%s_%s" % (alias, k) - if symver == current_version: - break - f.write("%s {\n" % symver) diff --git a/SPECS/libtalloc.spec b/SPECS/libtalloc.spec index f1195ed..521a264 100644 --- a/SPECS/libtalloc.spec +++ b/SPECS/libtalloc.spec @@ -1,6 +1,6 @@ Name: libtalloc -Version: 2.2.0 -Release: 7%{?dist} +Version: 2.3.1 +Release: 2%{?dist} Group: System Environment/Daemons Summary: The talloc library License: LGPLv3+ @@ -19,7 +19,6 @@ Obsoletes: python2-talloc-devel < %{version}-%{release} Obsoletes: python2-talloc-debuginfo < %{version}-%{release} # Patches -Patch0001: py3_abi.patch %description A library that implements a hierarchical allocator with destructors. @@ -108,6 +107,9 @@ cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir} %ldconfig_scriptlets -n python3-talloc %changelog +* Tue Jun 2 2020 Isaac Boukris - 2.3.1-2 +- resolves: rhbz#1817560 - Update to version 2.3.1 + * Mon Nov 25 2019 Isaac Boukris - 2.2.0-7 - related: rhbz#1754417 - Fix PY3 symbol names