.dblatex.metadata

@@ -1 +1 @@
-938d6f4071e604995bc4defa8b20c051e93d0aa2 SOURCES/dblatex3-0.3.12.tar.bz2
+ef370b64256f0799997b59bf1f6f73ec5b3c7237 SOURCES/dblatex-0.3.10.tar.bz2

.gitignore

@@ -1 +1 @@
-SOURCES/dblatex3-0.3.12.tar.bz2
+SOURCES/dblatex-0.3.10.tar.bz2

SOURCES/dblatex-0.3.10-disable-debian.patch

@@ -1,12 +1,8 @@
-From 0d8a7080f7fdc158a635e939e06bc7884a034ab1 Mon Sep 17 00:00:00 2001
+From fd0b6b1f8e3acf7025bb1ebe48305311502ae12a Mon Sep 17 00:00:00 2001
-Message-Id: <0d8a7080f7fdc158a635e939e06bc7884a034ab1.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:38:43 +0200
-Subject: [PATCH 12/13] Disable Debian
+Subject: [PATCH 2/4] Disable Debian
 
-Signed-off-by: Michael J Gruber <github@grubix.eu>
 ---
  setup.py | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
@@ -40,5 +36,5 @@ index 379323b..86619ec 100644
          if not(db) and not(self.nodeps):
              try:
 -- 
-2.23.0.369.g5d0cb2d495
+2.17.1
 

SOURCES/dblatex-0.3.10-fix-shebangs.patch

@@ -0,0 +1,75 @@
+From 11df13b7bfe0de918754d61dd431cad5c6349d39 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro@redhat.com>
+Date: Tue, 26 Jun 2018 18:11:24 +0200
+Subject: [PATCH 4/4] Fix shebangs
+
+---
+ lib/dbtexmf/dblatex/xetex/fontspec.py  | 2 +-
+ lib/dbtexmf/dblatex/xetex/fsconfig.py  | 2 +-
+ lib/dbtexmf/dblatex/xetex/fsencoder.py | 2 +-
+ scripts/dblatex                        | 2 +-
+ setup.py                               | 4 ++--
+ 5 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/lib/dbtexmf/dblatex/xetex/fontspec.py b/lib/dbtexmf/dblatex/xetex/fontspec.py
+index 767d003..da6a3e0 100644
+--- a/lib/dbtexmf/dblatex/xetex/fontspec.py
++++ b/lib/dbtexmf/dblatex/xetex/fontspec.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ # -*- coding: utf-8 -*-
+ # Time-stamp: <2008-06-23 22:21:26 ah>
+ 
+diff --git a/lib/dbtexmf/dblatex/xetex/fsconfig.py b/lib/dbtexmf/dblatex/xetex/fsconfig.py
+index 06c9adf..0477d35 100644
+--- a/lib/dbtexmf/dblatex/xetex/fsconfig.py
++++ b/lib/dbtexmf/dblatex/xetex/fsconfig.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ # -*- coding: utf-8 -*-
+ # Time-stamp: <2008-06-23 22:21:26 ah>
+ 
+diff --git a/lib/dbtexmf/dblatex/xetex/fsencoder.py b/lib/dbtexmf/dblatex/xetex/fsencoder.py
+index 6175adf..48a0fd2 100644
+--- a/lib/dbtexmf/dblatex/xetex/fsencoder.py
++++ b/lib/dbtexmf/dblatex/xetex/fsencoder.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ # -*- coding: utf-8 -*-
+ # Time-stamp: <2008-06-23 22:21:26 ah>
+ 
+diff --git a/scripts/dblatex b/scripts/dblatex
+index aa199d0..a42ea49 100755
+--- a/scripts/dblatex
++++ b/scripts/dblatex
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/python3
+ import sys
+ import os
+ 
+diff --git a/setup.py b/setup.py
+index 799c1d2..0881d58 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ # -*- coding: ISO-8859-1 -*-
+ #
+ # dblatex python setup script - See the COPYRIGHT
+@@ -33,7 +33,7 @@ sys.path.append("lib")
+ #
+ class BuildScripts(build_scripts):
+ 
+-    SHELL_SCRIPT = """#!%(env_executable)s%(env_args)s%(py_executable)s
++    SHELL_SCRIPT = """#!/usr/bin/python3
+ import sys
+ import os
+ 
+-- 
+2.17.1
+

SOURCES/dblatex-0.3.10-use-shutil-which.patch

@@ -1,12 +1,8 @@
-From af5dc6ec530b107a4a0bd6ac9b2e80b0e7d36077 Mon Sep 17 00:00:00 2001
+From e90833a7f4e8c64009bec11f569e89397203b822 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
+Subject: [PATCH 3/4] Use which from shutil
 
-Signed-off-by: Michael J Gruber <github@grubix.eu>
 ---
  setup.py | 10 ++++------
  1 file changed, 4 insertions(+), 6 deletions(-)
@@ -38,5 +34,5 @@ index 86619ec..799c1d2 100644
  
  def kpsewhich(tex_file):
 -- 
-2.23.0.369.g5d0cb2d495
+2.17.1
 

SOURCES/dblatex-0.3.11-replace-inkscape-by-rsvg.patch

@@ -1,33 +0,0 @@
-From ed7d6c2fa6e7848295893d455789ecb3e692b49f Mon Sep 17 00:00:00 2001
-Message-Id: <ed7d6c2fa6e7848295893d455789ecb3e692b49f.1613646685.git.github@grubix.eu>
-From: Michael J Gruber <github@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 <github@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
-

SPECS/dblatex.spec

@@ -1,6 +1,8 @@
+%{!?python3_sitelib: %define python3_sitelib %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 Name:       dblatex
-Version:    0.3.12
+Version:    0.3.10
-Release:    4%{?dist}
+Release:    8%{?dist}
 Summary:    DocBook to LaTeX/ConTeXt Publishing
 BuildArch:  noarch
 # Most of package is GPLv2+, except:
@@ -11,15 +13,15 @@ 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}3-%{version}.tar.bz2
+Source0:    http://downloads.sourceforge.net/%{name}/%{name}-%{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
+Patch0:     dblatex-0.3.10-enable-python3.patch
-Patch1:     dblatex-0.3.11-which-shutil.patch
+Patch1:     dblatex-0.3.10-disable-debian.patch
-Patch2:     dblatex-0.3.11-replace-inkscape-by-rsvg.patch
+Patch2:     dblatex-0.3.10-use-shutil-which.patch
+Patch3:     dblatex-0.3.10-fix-shebangs.patch
 
 BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
 BuildRequires:  libxslt
 BuildRequires:  texlive-base
 BuildRequires:  texlive-collection-latex
@@ -37,7 +39,6 @@ BuildRequires:  texlive-pdfpages
 BuildRequires:  texlive-subfigure
 BuildRequires:  texlive-stmaryrd
 BuildRequires:  texlive-wasysym
-Buildrequires:  /usr/bin/pathfix.py
 Requires:       texlive-base
 Requires:       texlive-collection-latex
 Requires:       texlive-collection-xetex
@@ -61,10 +62,9 @@ Requires:       texlive-stmaryrd
 Requires:       texlive-wasysym
 Requires:       texlive-xmltex-bin
 Requires:       libxslt docbook-dtds
-Recommends:     ImageMagick
 Recommends:     texlive-epstopdf-bin
 Recommends:     transfig
-Recommends:     librsvg2-tools
+Recommends:     inkscape
 
 %description
 dblatex is a program that transforms your SGML/XMLDocBook
@@ -79,22 +79,19 @@ Authors:
 
 
 %prep
-%setup -q -n %{name}3-%{version}
+%setup -q
-%patch0 -p1 -b .disable-debian
+%patch0 -p1 -b .enable-python3
-%patch1 -p1 -b .which-shutil
+%patch1 -p1 -b .disable-debian
-%patch2 -p1 -b .rsvg
+%patch2 -p1 -b .use-shutil-which
+%patch3 -p1 -b .fix-shebangs
 
 rm -rf lib/contrib
-pathfix.py -pni "%{__python3} %{py3_shbang_opts}" .
 
 %build
 %{__python3} setup.py build
 
-
 %install
 %{__python3} setup.py install --root $RPM_BUILD_ROOT
-pathfix.py -pni "%{__python3} %{py3_shbang_opts}" $RPM_BUILD_ROOT%{_bindir}/dblatex
-
 # these are already in tetex-latex:
 for file in bibtopic.sty enumitem.sty ragged2e.sty passivetex/ xelatex/; do
   rm -rf $RPM_BUILD_ROOT%{_datadir}/dblatex/latex/misc/$file
@@ -136,64 +133,14 @@ cp -p %{SOURCE1} COPYING-docbook-xsl
 %postun -p /usr/bin/texhash
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.3.12-4
+* Wed Jun 13 2018 Nikola Forró <nforro@redhat.com> - 0.3.10-8
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- switch to Python 3 (#1590857)
-  Related: rhbz#1991688
-
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 0.3.12-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Thu Feb 18 2021 Michael J Gruber <mjg@fedoraproject.org> - 0.3.12-2
-- replace inkscape by rsvg (#bz 1833047)
-
-* Thu Feb 18 2021 Michael J Gruber <mjg@fedoraproject.org> - 0.3.12-1
-- rebase to 0.3.12
-- follow yet another package/tree renaming
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.11-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.11-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jun 23 2020 Michael J Gruber <mjg@fedoraproject.org> - 0.3.11-6
-- BR setuptools explicitly
-
-* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 0.3.11-5
-- Rebuilt for Python 3.9
-
-* Wed Feb 05 2020 Michael J Gruber <mjg@fedoraproject.org> - 0.3.11-4
-- rebase to upstreamed py3 version (bz 1796232)
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.11-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Mon Sep 23 2019 Michael J Gruber <mjg@fedoraproject.org> - 0.3.11-2
-- port to python3 (bz #1737967)
-
-* Sun Sep 22 2019 Michael J Gruber <mjg@fedoraproject.org> - 0.3.11-1
-- bugfix release (bz #1753399)
-
-* Tue Sep 10 2019 Gwyn Ciesla <gwync@protonmail.com> - 0.3.10-12
-- Rebundle python2-which.
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.10-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Feb 12 2019 Michael J Gruber <mjg@fedoraproject.org> - 0.3.10-10
-- fix FTBFS on F30 (#1674789)
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.10-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Sep 10 2018 Michael J Gruber <mjg@fedoraproject.org> - 0.3.10-8
-- make shebangs unambiguous
 
-* Fri Jul 13 2018 Michael J Gruber <mjg@fedoraproject.org> - 0.3.10-7
+* Wed May 16 2018 Than Ngo <than@redhat.com> - 0.3.10-7
-- adjust to py2 packaging guidelines (fix FTBFS on rawhide)
+- fixed bz#1545772 - FTBFS
 
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.10-6
+* Wed Apr 18 2018 Nikola Forró <nforro@redhat.com> - 0.3.10-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+- remove ImageMagick dependency (#1564991)
 
 * Wed Apr 11 2018 Nikola Forró <nforro@redhat.com> - 0.3.10-5
 - make non-critical graphic tools weak dependencies