Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dblatex for openSUSE:Factory checked in at 2021-10-05 22:33:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dblatex (Old) and /work/SRC/openSUSE:Factory/.dblatex.new.2443 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dblatex" Tue Oct 5 22:33:36 2021 rev:26 rq:922544 version:0.3.12 Changes: -------- --- /work/SRC/openSUSE:Factory/dblatex/dblatex.changes 2020-08-20 22:24:46.459867542 +0200 +++ /work/SRC/openSUSE:Factory/.dblatex.new.2443/dblatex.changes 2021-10-05 22:33:49.766866935 +0200 @@ -1,0 +2,21 @@ +Fri Oct 1 10:04:32 UTC 2021 - Dominique Leuenberger <dims...@opensuse.org> + +- Fix replacement of "env python" to python3 in dblatex' main + script: upstream moved this already to python3. + +------------------------------------------------------------------- +Mon Sep 27 19:34:36 UTC 2021 - Matej Cepl <mc...@suse.com> + +- Upgrade to 0.3.12 (python3 version): + - Fix SF bug #118: fix 'nb' and 'nn' locales. + - Fix SF bug #119: use locale quotes in glossary. + - Fix SF bug #120: use locale quotes in bibliography. + - Fix SF bug #123: add 'se' locale. + - Fix SF bug #124: set default qandaset title markup in english. +- Added also: + - dblatex-0.3.11-replace-inkscape-by-rsvg.patch (filed as + https://sourceforge.net/p/dblatex/feature-requests/21) + - dblatex-0.3.11-which-shutil.patch (filed as + https://sourceforge.net/p/dblatex/patches/22) + +------------------------------------------------------------------- Old: ---- dblatex-0.3.11.tar.bz2 New: ---- dblatex-0.3.11-replace-inkscape-by-rsvg.patch dblatex-0.3.11-which-shutil.patch dblatex3-0.3.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dblatex.spec ++++++ --- /var/tmp/diff_new_pack.ZPGpjA/_old 2021-10-05 22:33:50.946868988 +0200 +++ /var/tmp/diff_new_pack.ZPGpjA/_new 2021-10-05 22:33:50.950868996 +0200 @@ -1,7 +1,7 @@ # # spec file for package dblatex # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,22 +17,33 @@ Name: dblatex -Version: 0.3.11 +Version: 0.3.12 Release: 0 Summary: DocBook to LaTeX Publishing License: GPL-2.0-only Group: Productivity/Publishing/DocBook URL: http://dblatex.sourceforge.net -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +Source0: http://downloads.sourceforge.net/%{name}/%{name}3-%{version}.tar.bz2 #PATCH-FIX-OPENSUSE dblatex-0.3.4-disable-debian.patch tog...@opensuse.org -disables debian specific installation parts +# Filed as https://sourceforge.net/p/dblatex/feature-requests/20 Patch0: dblatex-0.3.4-disable-debian.patch +# PATCH-FEATURE-UPSTREAM dblatex-0.3.11-replace-inkscape-by-rsvg.patch mc...@suse.com +# From https://src.fedoraproject.org/rpms/dblatex/raw/rawhide/f/dblatex-0.3.11-replace-inkscape-by-rsvg.patch +# Filed as https://sourceforge.net/p/dblatex/feature-requests/21 +# Don???t depend on the giant inkscape, but use rather smaller rsvg-convert instead +Patch1: dblatex-0.3.11-replace-inkscape-by-rsvg.patch +# PATCH-FEATURE-UPSTREAM dblatex-0.3.11-which-shutil.patch mc...@suse.com +# From https://src.fedoraproject.org/rpms/dblatex/raw/rawhide/f/dblatex-0.3.11-which-shutil.patch +# Filed as https://sourceforge.net/p/dblatex/patches/11 +# No need to use complicated internal functions, when shutil.which exists +Patch2: dblatex-0.3.11-which-shutil.patch BuildRequires: ImageMagick BuildRequires: fdupes BuildRequires: grep BuildRequires: libxslt-tools BuildRequires: python-rpm-macros -BuildRequires: python2-base -BuildRequires: pyxml +BuildRequires: python3-base +BuildRequires: rsvg-convert BuildRequires: texlive-epstopdf BuildRequires: texlive-latex BuildRequires: texlive-makeindex @@ -78,7 +89,6 @@ BuildRequires: tex(titlesec.sty) BuildRequires: tex(wasysym.sty) Requires: docbook_4 -Requires: pyxml Requires: texlive-epstopdf Requires: texlive-latex # grep for \usepackage in dblatex but require only one @@ -124,8 +134,8 @@ # db2latex contrib style Recommends: tex(anysize.sty) Recommends: tex(fancybox.sty) -Recommends: tex(rotating.sty) Recommends: tex(palatino.sty) +Recommends: tex(rotating.sty) # some extra unicode symbols (runtime detection) Recommends: tex(stmaryrd.sty) Recommends: tex(wasysym.sty) @@ -149,8 +159,8 @@ MathML 2.0 markups are supported, too. It started as a clone of DB2LaTeX. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 -n %{name}3-%{version} + # correct doc paths in setup sed -i 's@share/doc/dblatex@%{_docdir}/dblatex@g' setup.py @@ -160,14 +170,14 @@ lib/dbtexmf/dblatex/xetex/fsconfig.py %build -%python2_build +%python3_build %install -%python2_install -sed -i "s|env python|python2|g" %{buildroot}%{_bindir}/dblatex +%python3_install +sed -i "s|env python|python|g" %{buildroot}%{_bindir}/dblatex %fdupes %{buildroot}%{_docdir} %fdupes %{buildroot}%{_datadir} -%fdupes %{buildroot}%{python2_sitelib} +%fdupes %{buildroot}%{python3_sitelib} %files doc %{_docdir}/dblatex @@ -175,7 +185,7 @@ %files %{_bindir}/dblatex %{_datadir}/dblatex -%{python2_sitelib}/* +%{python3_sitelib}/* %{_mandir}/man1/dblatex.1%{?ext_man} %changelog ++++++ dblatex-0.3.11-replace-inkscape-by-rsvg.patch ++++++ >From ed7d6c2fa6e7848295893d455789ecb3e692b49f Mon Sep 17 00:00:00 2001 Message-Id: <ed7d6c2fa6e7848295893d455789ecb3e692b49f.1613646685.git.git...@grubix.eu> From: Michael J Gruber <git...@grubix.eu> 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 <git...@grubix.eu> --- 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 ++++++ dblatex-0.3.11-which-shutil.patch ++++++ >From af5dc6ec530b107a4a0bd6ac9b2e80b0e7d36077 Mon Sep 17 00:00:00 2001 Message-Id: <af5dc6ec530b107a4a0bd6ac9b2e80b0e7d36077.1569226914.git.git...@grubix.eu> In-Reply-To: <49b85799a8f0674ac5eb6f2dfc37b23208d9754a.1569226914.git.git...@grubix.eu> References: <49b85799a8f0674ac5eb6f2dfc37b23208d9754a.1569226914.git.git...@grubix.eu> From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nfo...@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 <git...@grubix.eu> --- setup.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) --- a/setup.py +++ b/setup.py @@ -209,17 +209,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): ++++++ dblatex-0.3.4-disable-debian.patch ++++++ --- /var/tmp/diff_new_pack.ZPGpjA/_old 2021-10-05 22:33:50.990869065 +0200 +++ /var/tmp/diff_new_pack.ZPGpjA/_new 2021-10-05 22:33:50.994869072 +0200 @@ -4,7 +4,7 @@ --- a/setup.py +++ b/setup.py -@@ -23,7 +23,8 @@ from distutils.command.sdist import sdis +@@ -25,7 +25,8 @@ from distutils.command.sdist import sdis from distutils import log from subprocess import Popen, PIPE sys.path.append("lib") @@ -14,7 +14,7 @@ # # Build the command line script -@@ -365,10 +366,11 @@ class Install(install): +@@ -373,10 +374,11 @@ class Install(install): raise OSError("not found: %s" % ", ".join(mis_stys)) def run(self): ++++++ dblatex-0.3.11.tar.bz2 -> dblatex3-0.3.12.tar.bz2 ++++++ ++++ 20749 lines of diff (skipped)
