diff --git a/0002-tdb-Fix-compatibility-of-wscript-with-older-python.patch b/0002-tdb-Fix-compatibility-of-wscript-with-older-python.patch new file mode 100644 index 0000000..9aaa0b6 --- /dev/null +++ b/0002-tdb-Fix-compatibility-of-wscript-with-older-python.patch @@ -0,0 +1,39 @@ +From 08be3793f00e26a87ce6a38a996cb6d9486e15bc Mon Sep 17 00:00:00 2001 +From: Lukas Slebodnik +Date: Fri, 18 Jan 2019 02:39:11 +0100 +Subject: [PATCH] tdb: Fix compatibility of wscript with older python + +Traceback (most recent call last): + File "tdb-1.3.17/third_party/waf/waflib/Scripting.py", line 158, in waf_entry_point + run_commands() + File "tdb-1.3.17/third_party/waf/waflib/Scripting.py", line 251, in run_commands + ctx = run_command(cmd_name) + File "tdb-1.3.17/third_party/waf/waflib/Scripting.py", line 235, in run_command + ctx.execute() + File "tdb-1.3.17/third_party/waf/waflib/Context.py", line 204, in execute + self.recurse([os.path.dirname(g_module.root_path)]) + File "tdb-1.3.17/third_party/waf/waflib/Context.py", line 286, in recurse + user_function(self) + File "tdb-1.3.17/wscript", line 225, in testonly + cmd = "BINDIR={} {}".format(blddir, sh_test) +ValueError: zero length field name in format +--- + wscript | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wscript b/wscript +index 6a6adabc4c1260d12cb984cb0aa5a806d9171f50..2c31f696808fcb105b15661c5d0ab65aadf7efe7 100644 +--- a/wscript ++++ b/wscript +@@ -222,7 +222,7 @@ def testonly(ctx): + sh_tests = ["test/test_tdbbackup.sh test/jenkins-be-hash.tdb"] + + for sh_test in sh_tests: +- cmd = "BINDIR={} {}".format(blddir, sh_test) ++ cmd = "BINDIR=%s %s" % (blddir, sh_test) + print("shell test: " + cmd) + ret = samba_utils.RUN_COMMAND(cmd) + if ret != 0: +-- +2.20.1 + diff --git a/libtdb.spec b/libtdb.spec index 8d102e1..f8985d6 100644 --- a/libtdb.spec +++ b/libtdb.spec @@ -26,6 +26,7 @@ Source: http://samba.org/ftp/tdb/tdb-%{version}.tar.gz # Patches Patch0001: 0001-Fix-detection-of-HAVE_LARGEFILE-with-python2.patch +Patch0002: 0002-tdb-Fix-compatibility-of-wscript-with-older-python.patch BuildRequires: gcc BuildRequires: libxslt