From 355fa344d1e2cbcef77aff7e2d69673f07d6006e Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Tue, 26 Feb 2019 23:45:20 +0100 Subject: [PATCH] Revert "Fix ValueError with older python2" This reverts commit 74818d39a0d93fcf8a5d5a1b3bc1485f412ff08f. Patch was merged upstream --- ...ibility-of-wscript-with-older-python.patch | 39 ------------------- libtdb.spec | 1 - 2 files changed, 40 deletions(-) delete mode 100644 0002-tdb-Fix-compatibility-of-wscript-with-older-python.patch diff --git a/0002-tdb-Fix-compatibility-of-wscript-with-older-python.patch b/0002-tdb-Fix-compatibility-of-wscript-with-older-python.patch deleted file mode 100644 index 9aaa0b6..0000000 --- a/0002-tdb-Fix-compatibility-of-wscript-with-older-python.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 c5d7060..8a8572d 100644 --- a/libtdb.spec +++ b/libtdb.spec @@ -26,7 +26,6 @@ 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