From de6a63aa19ad4c7a6e1fd3387b2f7eed26c9d6e5 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jakub.hrozek@posteo.se>
Date: Jul 12 2018 11:36:36 +0000
Subject: 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
  yield py2 anymore

---

diff --git a/.gitignore b/.gitignore
index b6a378a..2faaa13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /tdb-1.3.13.tar.gz
 /tdb-1.3.14.tar.gz
 /tdb-1.3.15.tar.gz
+/tdb-1.3.16.tar.gz
diff --git a/libtdb.spec b/libtdb.spec
index 2a6ce26..b006fc4 100644
--- a/libtdb.spec
+++ b/libtdb.spec
@@ -5,8 +5,8 @@
 %endif
 
 Name: libtdb
-Version: 1.3.15
-Release: 5%{?dist}
+Version: 1.3.16
+Release: 1%{?dist}
 Summary: The tdb library
 License: LGPLv3+
 URL: http://tdb.samba.org/
@@ -22,6 +22,8 @@ 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.
@@ -60,7 +62,7 @@ Python3 bindings for libtdb
 %endif
 
 %prep
-%setup -q -n tdb-%{version}
+%autosetup -n tdb-%{version} -p1
 
 %build
 %if 0%{?with_python3}
@@ -109,8 +111,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libtdb.a
 %{_mandir}/man8/tdbrestore.8*
 
 %files -n python2-tdb
-%{python_sitearch}/tdb.so
-%{python_sitearch}/_tdb_text.py*
+%{python2_sitearch}/tdb.so
+%{python2_sitearch}/_tdb_text.py*
 
 %if 0%{?with_python3}
 %files -n python3-tdb
@@ -134,6 +136,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libtdb.a
 %endif
 
 %changelog
+* Thu Jul 12 2018 Jakub Hrozek <jhrozek@redhat.com> - 1.3.16-6
+- 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
+  yield py2 anymore
+
 * Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.3.15-5
 - Rebuilt for Python 3.7
 
diff --git a/sources b/sources
index 50ead08..7437eec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tdb-1.3.15.tar.gz) = 553246d5e7a7c22ea1b00962ac635d608f6d2344201862e796cad3b1a20610da1f5652ec9dbcb0187867fbd25f36247fcc34e9b4b2c3488c15d7202c9fb13bbb
+SHA512 (tdb-1.3.16.tar.gz) = 7b17852986e48a32f3f8f303dd2a26503a69fcf7849f22f51483334c9abda9f189b521679e51b4ee5a80197a8f304a084dde0f56d92cfe953d3a4ede557526d2
diff --git a/tdb-dont-use-usr-bin-env-python.patch b/tdb-dont-use-usr-bin-env-python.patch
new file mode 100644
index 0000000..272fd13
--- /dev/null
+++ b/tdb-dont-use-usr-bin-env-python.patch
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 0000000..9046431
--- /dev/null
+++ b/tdb-hide-local-ABI-symbols.patch
@@ -0,0 +1,20 @@
+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")