dblatex 0.3.11-1 (znver1;aarch64;x86_64) 2020-12052
9999

Status published
Submitter cris [@T] beebgames.com
Platform rolling
Repository main
URL https://abf.openmandriva.org/build_lists/810911
Packages
dblatex-0.3.11-1.znver1.source
dblatex-0.3.11-1.znver1.binary
dblatex-0.3.11-1.aarch64.source
dblatex-0.3.11-1.aarch64.binary
dblatex-0.3.11-1.x86_64.source
dblatex-0.3.11-1.x86_64.binary
Build Date 2020-07-28 11:28:13 +0000 UTC
Last Updated 2020-08-01 19:40:38.513603284 +0000 UTC
$ git show --format=fuller --patch-with-stat --summary 7980bd54016d73d469b2defdaf2d76fee3c77fd9

commit 7980bd54016d73d469b2defdaf2d76fee3c77fd9
Author:     Crispin Boylan <crisb@mandriva.org>
AuthorDate: Tue Jul 28 09:19:35 2020 +0100
Commit:     Crispin Boylan <crisb@mandriva.org>
CommitDate: Tue Jul 28 09:19:35 2020 +0100

    0.3.11, py3 version
---
 dblatex-0.2.7-external-which.patch | 12 -----------
 dblatex-0.3.11-which-shutil.patch  | 42 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 12 deletions(-)
 delete mode 100644 dblatex-0.2.7-external-which.patch
 create mode 100644 dblatex-0.3.11-which-shutil.patch

diff --git a/dblatex-0.2.7-external-which.patch b/dblatex-0.2.7-external-which.patch
deleted file mode 100644
index f37232b..0000000
--- a/dblatex-0.2.7-external-which.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up dblatex-0.2.7/setup.py.external_which dblatex-0.2.7/setup.py
---- dblatex-0.2.7/setup.py.external_which	2007-04-26 21:08:56.000000000 +0200
-+++ dblatex-0.2.7/setup.py	2007-07-22 19:35:05.000000000 +0200
-@@ -147,7 +147,7 @@ os.environ["SGML_CATALOG_FILES"] = cat
- 
- def find_programs(utils):
-     sys.path.append("lib")
--    from contrib.which import which
-+    import which
-     util_paths = {}
-     missed = []
-     for util in utils:
diff --git a/dblatex-0.3.11-which-shutil.patch b/dblatex-0.3.11-which-shutil.patch
new file mode 100644
index 0000000..37f4f36
--- /dev/null
+++ b/dblatex-0.3.11-which-shutil.patch
@@ -0,0 +1,42 @@
+From af5dc6ec530b107a4a0bd6ac9b2e80b0e7d36077 Mon Sep 17 00:00:00 2001
+Message-Id: <af5dc6ec530b107a4a0bd6ac9b2e80b0e7d36077.1569226914.git.github@grubix.eu>
+In-Reply-To: <49b85799a8f0674ac5eb6f2dfc37b23208d9754a.1569226914.git.github@grubix.eu>
+References: <49b85799a8f0674ac5eb6f2dfc37b23208d9754a.1569226914.git.github@grubix.eu>
+From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro@redhat.com>
+Date: Tue, 26 Jun 2018 17:41:19 +0200
+Subject: [PATCH 13/13] Use which from shutil
+
+Signed-off-by: Michael J Gruber <github@grubix.eu>
+---
+ setup.py | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 86619ec..799c1d2 100644
+--- a/setup.py
++++ b/setup.py
+@@ -208,17 +208,15 @@ class Build(build):
+ 
+ 
+ def find_programs(utils):
+-    sys.path.append("lib")
+-    from contrib.which import which
++    import shutil
+     util_paths = {}
+     missed = []
+     for util in utils:
+-        try:
+-            path = which.which(util)
++        path = shutil.which(util)
++        if path:
+             util_paths[util] = path
+-        except which.WhichError:
++        else:
+             missed.append(util)
+-    sys.path.remove("lib")
+     return (util_paths, missed)
+ 
+ def kpsewhich(tex_file):
+-- 
+2.23.0.369.g5d0cb2d495
+
Not Available

benbullard79 [@T] cox.netNo Comment.1335d 18hrs
benbullard79 [@T] cox.netNo Comment.1335d 18hrs