From 7237904a04171e7248efc75b6427909bc49efcc3 Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Jul 13 2018 06:28:43 +0000 Subject: Drop the unneeded ABI hide patch Use pathfix.py instead of a local patch to munge the python path --- diff --git a/libtalloc.spec b/libtalloc.spec index c1dad9e..dacccfa 100644 --- a/libtalloc.spec +++ b/libtalloc.spec @@ -6,7 +6,7 @@ Name: libtalloc Version: 2.1.14 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Daemons Summary: The talloc library License: LGPLv3+ @@ -25,8 +25,6 @@ BuildRequires: doxygen Provides: bundled(libreplace) # Patches -Patch0001: talloc-dont-use-usr-bin-env-python.patch -Patch0002: talloc-hide-local-ABI-symbols.patch %description A library that implements a hierarchical allocator with destructors. @@ -97,6 +95,8 @@ PY3_CONFIG_FLAGS="" # workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1217376 export python_LDFLAGS="" +pathfix.py -n -p -i %{__python2} buildtools/bin/waf + %configure --disable-rpath \ --disable-rpath-install \ --bundled-libraries=NONE \ @@ -163,6 +163,10 @@ cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir} %endif %changelog +* Fri Jul 13 2018 Jakub Hrozek - 2.1.14-2 +- Drop the unneeded ABI hide patch +- Use pathfix.py instead of a local patch to munge the python path + * Thu Jul 12 2018 Jakub Hrozek - 2.1.14-1 - New upstream release - 2.1.14 - Apply a patch to hide local ABI symbols to avoid issues with new binutils diff --git a/talloc-dont-use-usr-bin-env-python.patch b/talloc-dont-use-usr-bin-env-python.patch deleted file mode 100644 index 3bc1909..0000000 --- a/talloc-dont-use-usr-bin-env-python.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -up talloc-2.1.14/buildtools/bin/waf.envpy talloc-2.1.14/buildtools/bin/waf ---- talloc-2.1.14/buildtools/bin/waf.envpy 2018-07-12 11:34:18.844030136 +0200 -+++ talloc-2.1.14/buildtools/bin/waf 2018-07-12 11:36:30.471618578 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python2 - # encoding: ISO-8859-1 - # Thomas Nagy, 2005-2010 - diff --git a/talloc-hide-local-ABI-symbols.patch b/talloc-hide-local-ABI-symbols.patch deleted file mode 100644 index bf5c8a6..0000000 --- a/talloc-hide-local-ABI-symbols.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up talloc-2.1.14/buildtools/wafsamba/samba_abi.py.sym_hide talloc-2.1.14/buildtools/wafsamba/samba_abi.py ---- talloc-2.1.14/buildtools/wafsamba/samba_abi.py.sym_hide 2015-12-10 12:01:40.000000000 +0100 -+++ talloc-2.1.14/buildtools/wafsamba/samba_abi.py 2018-07-12 11:46:30.024298881 +0200 -@@ -192,10 +192,12 @@ def abi_write_vscript(f, libname, curren - f.write("\t\t%s;\n" % x) - else: - f.write("\t\t*;\n") -- if abi_match != ["*"]: -- f.write("\tlocal:\n") -- for x in local_abi: -- f.write("\t\t%s;\n" % x[1:]) -+ # Always hide symbols that must be local if exist -+ local_abi.extend(["!_end", "!_bss_start", "!_edata"]) -+ f.write("\tlocal:\n") -+ for x in local_abi: -+ f.write("\t\t%s;\n" % x[1:]) -+ if global_abi != ["*"]: - if len(global_abi) > 0: - f.write("\t\t*;\n") - f.write("};\n")