diff --git a/.gitignore b/.gitignore index 666d1b2..212bbd8 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /dblatex-0.3.10.tar.bz2 /dblatex-0.3.11.tar.bz2 /dblatex-0.3.11py3.tar.bz2 +/dblatex3-0.3.12.tar.bz2 diff --git a/dblatex-0.3.11-replace-inkscape-by-rsvg.patch b/dblatex-0.3.11-replace-inkscape-by-rsvg.patch new file mode 100644 index 0000000..34d555e --- /dev/null +++ b/dblatex-0.3.11-replace-inkscape-by-rsvg.patch @@ -0,0 +1,33 @@ +From ed7d6c2fa6e7848295893d455789ecb3e692b49f Mon Sep 17 00:00:00 2001 +Message-Id: +From: Michael J Gruber +Date: Thu, 18 Feb 2021 12:09:29 +0100 +Subject: [PATCH] replace inkscape by rsvg + +Inkscape broke headless commandline usage and appears not be fixing it, +see: https://gitlab.com/inkscape/inkscape/-/issues/1342 + +Switch to rsvg as recommended by upstream, see: +https://sourceforge.net/p/dblatex/mailman/message/37005820/ + +Signed-off-by: Michael J Gruber +--- + lib/dbtexmf/core/imagedata.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/dbtexmf/core/imagedata.py b/lib/dbtexmf/core/imagedata.py +index 32b7746..7c13e79 100644 +--- a/lib/dbtexmf/core/imagedata.py ++++ b/lib/dbtexmf/core/imagedata.py +@@ -181,7 +181,7 @@ class FigConverter(ImageConverter): + class SvgConverter(ImageConverter): + def __init__(self, imgsrc, imgdst="", docformat="", backend=""): + ImageConverter.__init__(self, imgsrc="svg", imgdst=imgdst) +- self.add_command(["inkscape", "-z", "-D", "--export-%(dst)s=%(output)s", ++ self.add_command(["rsvg-convert", "-a", "-f", "%(dst)s", "-o", "%(output)s", + "%(input)s"]) + + +-- +2.30.1.672.g8d3081386a + diff --git a/dblatex.spec b/dblatex.spec index 1df6c62..9d30615 100644 --- a/dblatex.spec +++ b/dblatex.spec @@ -1,6 +1,6 @@ Name: dblatex -Version: 0.3.11 -Release: 8%{?dist} +Version: 0.3.12 +Release: 2%{?dist} Summary: DocBook to LaTeX/ConTeXt Publishing BuildArch: noarch # Most of package is GPLv2+, except: @@ -11,11 +11,12 @@ BuildArch: noarch # latex/misc/passivetex is MIT (not included in binary RPM so not listed) License: GPLv2+ and GPLv2 and LPPL and DMIT and Public Domain URL: http://dblatex.sourceforge.net/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}py3.tar.bz2 +Source0: http://downloads.sourceforge.net/%{name}/%{name}3-%{version}.tar.bz2 # Source1 is from http://docbook.sourceforge.net/release/xsl/current/COPYING Source1: COPYING-docbook-xsl Patch0: dblatex-0.3.11-disable-debian.patch Patch1: dblatex-0.3.11-which-shutil.patch +Patch2: dblatex-0.3.11-replace-inkscape-by-rsvg.patch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -63,7 +64,7 @@ Requires: libxslt docbook-dtds Recommends: ImageMagick Recommends: texlive-epstopdf-bin Recommends: transfig -Recommends: inkscape +Recommends: librsvg2-tools %description dblatex is a program that transforms your SGML/XMLDocBook @@ -78,9 +79,10 @@ Authors: %prep -%setup -q -n %{name}-%{version}py3 +%setup -q -n %{name}3-%{version} %patch0 -p1 -b .disable-debian %patch1 -p1 -b .which-shutil +%patch2 -p1 -b .rsvg rm -rf lib/contrib pathfix.py -pni "%{__python3} %{py3_shbang_opts}" . @@ -134,6 +136,13 @@ cp -p %{SOURCE1} COPYING-docbook-xsl %postun -p /usr/bin/texhash %changelog +* Thu Feb 18 2021 Michael J Gruber - 0.3.12-2 +- replace inkscape by rsvg (#bz 1833047) + +* Thu Feb 18 2021 Michael J Gruber - 0.3.12-1 +- rebase to 0.3.12 +- follow yet another package/tree renaming + * Tue Jan 26 2021 Fedora Release Engineering - 0.3.11-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 4d7e11d..272a9f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dblatex-0.3.11py3.tar.bz2) = 48c1445c702e9c7c3ff83c57bb8a0caf5f4b027669a70887af0a23f75f5f99fb6840c4281b8bad9402910f3850af485d432e3109e5fd93184434cc87eb712695 +SHA512 (dblatex3-0.3.12.tar.bz2) = 5bfa774c8dbe362775f6bbb5e1196e5a2bb1af239778133c12ddc725406ced67f3ff422433a2a1aa02d4431e9be58ba12e918379deb81fcd5b96533d2bdf029a