From a4c2634314d71780e8a7b5a5126399e22e7ef614 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jakub.hrozek@posteo.se>
Date: Jul 13 2018 06:31:25 +0000
Subject: Drop the unneeded ABI hide patch

Use pathfix.py instead of a local patch to munge the python path

---

diff --git a/libtdb.spec b/libtdb.spec
index 8250938..09cb726 100644
--- a/libtdb.spec
+++ b/libtdb.spec
@@ -6,7 +6,7 @@
 
 Name: libtdb
 Version: 1.3.16
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The tdb library
 License: LGPLv3+
 URL: http://tdb.samba.org/
@@ -23,8 +23,6 @@ BuildRequires: python3-devel
 Provides: bundled(libreplace)
 
 # Patches
-Patch0001:  tdb-dont-use-usr-bin-env-python.patch
-Patch0002:  tdb-hide-local-ABI-symbols.patch
 
 %description
 A library that implements a trivial database.
@@ -72,6 +70,8 @@ PY3_CONFIG_FLAGS=--extra-python=%{__python3}
 PY3_CONFIG_FLAGS=""
 %endif
 
+pathfix.py -n -p -i %{__python2} buildtools/bin/waf
+
 %configure --disable-rpath \
            --bundled-libraries=NONE \
            --builtin-libraries=replace \
@@ -137,7 +137,11 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libtdb.a
 %endif
 
 %changelog
-* Thu Jul 12 2018 Jakub Hrozek <jhrozek@redhat.com> - 1.3.16-6
+* Fri Jul 13 2018 Jakub Hrozek <jhrozek@redhat.com> - 1.3.16-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 <jhrozek@redhat.com> - 1.3.16-1
 - New upstream release 1.3.16
 - Apply a patch to hide local ABI symbols to avoid issues with new binutils
 - Patch the waf script to explicitly call python2 as "env python" doesn't
diff --git a/tdb-dont-use-usr-bin-env-python.patch b/tdb-dont-use-usr-bin-env-python.patch
deleted file mode 100644
index 272fd13..0000000
--- a/tdb-dont-use-usr-bin-env-python.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -up tdb-1.3.16/buildtools/bin/waf.envpy tdb-1.3.16/buildtools/bin/waf
---- tdb-1.3.16/buildtools/bin/waf.envpy	2018-07-12 12:56:02.378782293 +0200
-+++ tdb-1.3.16/buildtools/bin/waf	2018-07-12 12:57:32.628975091 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python2
- # encoding: ISO-8859-1
- # Thomas Nagy, 2005-2010
- 
diff --git a/tdb-hide-local-ABI-symbols.patch b/tdb-hide-local-ABI-symbols.patch
deleted file mode 100644
index 9046431..0000000
--- a/tdb-hide-local-ABI-symbols.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -up tdb-1.3.16/buildtools/wafsamba/samba_abi.py.sym_hide tdb-1.3.16/buildtools/wafsamba/samba_abi.py
---- tdb-1.3.16/buildtools/wafsamba/samba_abi.py.sym_hide	2018-07-12 13:17:49.211669200 +0200
-+++ tdb-1.3.16/buildtools/wafsamba/samba_abi.py	2018-07-12 13:18:10.344759033 +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")