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.10.tar.bz2 b/dblatex-0.3.10.tar.bz2 deleted file mode 100644 index 6b4520e..0000000 Binary files a/dblatex-0.3.10.tar.bz2 and /dev/null differ diff --git a/dblatex-0.3.11-disable-debian.patch b/dblatex-0.3.11-disable-debian.patch new file mode 100644 index 0000000..057606a --- /dev/null +++ b/dblatex-0.3.11-disable-debian.patch @@ -0,0 +1,44 @@ +From 0d8a7080f7fdc158a635e939e06bc7884a034ab1 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?= +Date: Tue, 26 Jun 2018 17:38:43 +0200 +Subject: [PATCH 12/13] Disable Debian + +Signed-off-by: Michael J Gruber +--- + setup.py | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/setup.py b/setup.py +index 379323b..86619ec 100644 +--- a/setup.py ++++ b/setup.py +@@ -26,7 +26,7 @@ from distutils.command.sdist import sdist + from distutils import log + from subprocess import Popen, PIPE + sys.path.append("lib") +-from contrib.debian.installer import DebianInstaller ++#from contrib.debian.installer import DebianInstaller + + # + # Build the command line script +@@ -373,10 +373,10 @@ class Install(install): + raise OSError("not found: %s" % ", ".join(mis_stys)) + + def run(self): +- if self.install_layout == "deb": +- db = DebianInstaller(self) +- else: +- db = None ++# if self.install_layout == "deb": ++# db = DebianInstaller(self) ++# else: ++ db = None + + if not(db) and not(self.nodeps): + try: +-- +2.23.0.369.g5d0cb2d495 + 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: +In-Reply-To: <49b85799a8f0674ac5eb6f2dfc37b23208d9754a.1569226914.git.github@grubix.eu> +References: <49b85799a8f0674ac5eb6f2dfc37b23208d9754a.1569226914.git.github@grubix.eu> +From: =?UTF-8?q?Nikola=20Forr=C3=B3?= +Date: Tue, 26 Jun 2018 17:41:19 +0200 +Subject: [PATCH 13/13] Use which from shutil + +Signed-off-by: Michael J Gruber +--- + 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 + diff --git a/dblatex-0.3.11py3.tar.bz2 b/dblatex-0.3.11py3.tar.bz2 new file mode 100644 index 0000000..b57fb55 Binary files /dev/null and b/dblatex-0.3.11py3.tar.bz2 differ diff --git a/dblatex-disable-debian.patch b/dblatex-disable-debian.patch deleted file mode 100644 index d2b2b05..0000000 --- a/dblatex-disable-debian.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- dblatex-0.3.4/setup.py 2012-06-02 16:43:42.000000000 -0700 -+++ dblatex-0.3.4/setup.py_disable_debian 2012-12-03 21:30:30.843851029 -0800 -@@ -23,7 +23,7 @@ from distutils.command.sdist import sdis - from distutils import log - from subprocess import Popen, PIPE - sys.path.append("lib") --from contrib.debian.installer import DebianInstaller -+#from contrib.debian.installer import DebianInstaller - - # - # Build the command line script -@@ -365,10 +365,10 @@ class Install(install): - raise OSError("not found: %s" % ", ".join(mis_stys)) - - def run(self): -- if self.install_layout == "deb": -- db = DebianInstaller(self) -- else: -- db = None -+# if self.install_layout == "deb": -+# db = DebianInstaller(self) -+# else: -+ db = None - - if not(db) and not(self.nodeps): - try: diff --git a/dblatex.spec b/dblatex.spec index 70c3339..fd141b3 100644 --- a/dblatex.spec +++ b/dblatex.spec @@ -1,19 +1,20 @@ Name: dblatex -Version: 0.3.10 -Release: 8 +Version: 0.3.11 +Release: 1 Summary: DocBook to LaTeX/ConTeXt Publishing BuildArch: noarch License: GPLv2+ and GPLv2 and LPPL and DMIT and Public Domain URL: http://dblatex.sourceforge.net/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}py3.tar.bz2 Source1: COPYING-docbook-xsl -Patch0000: dblatex-0.2.7-external-which.patch -Patch0001: dblatex-disable-debian.patch +Patch0000: dblatex-0.3.11-disable-debian.patch +Patch0001: dblatex-0.3.11-which-shutil.patch -BuildRequires: python2-devel python2-which libxslt texlive-base texlive-collection-latex texlive-collection-xetex +BuildRequires: python3-devel python3-setuptools libxslt texlive-base texlive-collection-latex texlive-collection-xetex BuildRequires: texlive-collection-htmlxml texlive-xmltex-bin texlive-anysize texlive-appendix texlive-changebar BuildRequires: texlive-fancybox texlive-jknapltx texlive-multirow texlive-overpic texlive-pdfpages texlive-subfigure BuildRequires: texlive-stmaryrd texlive-wasysym +Buildrequires: /usr/bin/pathfix.py Requires: texlive-base texlive-collection-latex texlive-collection-xetex texlive-collection-htmlxml Requires: texlive-passivetex texlive-xmltex texlive-xmltex-bin texlive-anysize texlive-appendix texlive-bibtopic @@ -35,15 +36,15 @@ Summary: Introduce how to use dblatex Introduce how to use dblatex %prep -%autosetup -n %{name}-%{version} -p1 +%autosetup -n %{name}-%{version}py3 -p1 rm -rf lib/contrib %build -%{__python2} setup.py build +%{__python3} setup.py build %install -%{__python2} setup.py install --root $RPM_BUILD_ROOT +%{__python3} setup.py install --root $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_datadir}/texlive/texmf-dist/tex/latex/dblatex for file in ` find $RPM_BUILD_ROOT%{_datadir}/dblatex/latex/ -name '*.sty' ` ; do @@ -66,8 +67,8 @@ cp -p %{SOURCE1} COPYING-docbook-xsl %files %doc COPYRIGHT COPYING-docbook-xsl -%{python2_sitelib}/dbtexmf/ -%{python2_sitelib}/dblatex-*.egg-info +%{python3_sitelib}/dbtexmf/ +%{python3_sitelib}/dblatex-*.egg-info %{_bindir}/dblatex %{_datadir}/dblatex/ %{_datadir}/texlive/texmf-dist/tex/latex/dblatex/ @@ -85,5 +86,8 @@ cp -p %{SOURCE1} COPYING-docbook-xsl %{_mandir}/man1/dblatex.1* %changelog +* Fri Nov 13 2020 liuweibo - 0.3.11-1 +- Update to 0.3.11 + * Fri Nov 22 2019 yangjian - 0.3.10-8 - Package init