From 7cc408e937e73f8caa81d4c921721b6ca222eade1cb285c5e24ee18ec8d7d842 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 22 Apr 2022 04:59:28 +0000 Subject: [PATCH] Accepting request 971943 from home:susnux:branches:Publishing - Update to version 2022 - Remove outdated manual latex2html-manual.tar.bz2, build up-to-date manual from source as part of the build process. - Drop latex2html-backref-workaround.diff, was a workaround for perl 5.18 not used in any supported openSUSE version anymore. OBS-URL: https://build.opensuse.org/request/show/971943 OBS-URL: https://build.opensuse.org/package/show/Publishing/latex2html?expand=0&rev=51 --- latex2html-2022.tar.gz | 3 +++ latex2html-backref-workaround.diff | 20 -------------------- latex2html-manual.tar.bz2 | 3 --- latex2html.changes | 14 ++++++++++++++ latex2html.spec | 24 +++++++++++++++--------- v2021.2.tar.gz | 3 --- 6 files changed, 32 insertions(+), 35 deletions(-) create mode 100644 latex2html-2022.tar.gz delete mode 100644 latex2html-backref-workaround.diff delete mode 100644 latex2html-manual.tar.bz2 delete mode 100644 v2021.2.tar.gz diff --git a/latex2html-2022.tar.gz b/latex2html-2022.tar.gz new file mode 100644 index 0000000..5e57972 --- /dev/null +++ b/latex2html-2022.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b3ba484226a2e39fb20695729370372b355f71bd65eeb4dd14f2c78699ed59a +size 1140425 diff --git a/latex2html-backref-workaround.diff b/latex2html-backref-workaround.diff deleted file mode 100644 index 190bb85..0000000 --- a/latex2html-backref-workaround.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- ./latex2html.pin.orig 2013-06-25 14:57:10.000000000 +0000 -+++ ./latex2html.pin 2013-06-25 14:57:27.000000000 +0000 -@@ -16557,7 +16557,7 @@ sub make_isolatin1_rx { - $caption_suffixes = "lof|lot"; - # $caption_rx = "\\\\caption\\s*([[]\\s*((($any_next_pair_rx5)|([[][^]]*[]])|[^]])*)[]])?$O(\\d+)$C([\\s\\S]*)$O\\8$C$EOL"; - -- $caption_rx = "\\\\(top|bottom|table)?caption\\s*\\\*?\\s*([[]\\s*((($any_next_pair_rx6)|([[][^]]*[]])|[^]])*)[]])?$O(\\d+)$C([\\s\\S]*)$O\\9$C$EOL"; -+ $caption_rx = "\\\\(top|bottom|table)?caption\\s*\\\*?\\s*([[]\\s*((($any_next_pair_rx6)|([[][^]]*[]])|[^]])*)[]])?$O(\\d+)$C([\\s\\S]*)$O\\g9$C$EOL"; - $caption_width_rx = "\\\\setlength\\s*(($O|$OP)\\d+($C|$CP))\\\\captionwidth\\1\\s*(($O|$OP)\\d+($C|$CP))([^>]*)\\4"; - - # Matches the \htmlimage command -@@ -16622,7 +16622,7 @@ sub make_isolatin1_rx { - - # Matches a label command and its argument - $labels_rx = "\\\\label\\s*$O(\\d+)$C([\\s\\S]*)$O\\1$C$EOL"; -- $labels_rx8 = "\\\\label\\s*$O(\\d+)$C([\\s\\S]*)$O\\8$C$EOL"; -+ $labels_rx8 = "\\\\label\\s*$O(\\d+)$C([\\s\\S]*)$O\\g8$C$EOL"; - - # Matches environments that should not be touched during the translation - # $verbatim_env_rx = "\\s*{(verbatim|rawhtml|LVerbatim)[*]?}"; diff --git a/latex2html-manual.tar.bz2 b/latex2html-manual.tar.bz2 deleted file mode 100644 index 17d2580..0000000 --- a/latex2html-manual.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:82bf235f18ce60c5d3a3c80117d29f812d9c39784d86cea13695832d4e0c62cc -size 303097 diff --git a/latex2html.changes b/latex2html.changes index e630e21..4007827 100644 --- a/latex2html.changes +++ b/latex2html.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Apr 21 22:13:32 UTC 2022 - Ferdinand Thiessen + +- Update to version 2022 + * fix cropped figures + * revert PreviewBorder to 0.5bp + * support download attribute for tag + * remove meta tags for distribution, etc + * allow input filename with no extension +- Remove outdated manual latex2html-manual.tar.bz2, + build up-to-date manual from source as part of the build process. +- Drop latex2html-backref-workaround.diff, was a workaround for + perl 5.18 not used in any supported openSUSE version anymore. + ------------------------------------------------------------------- Tue Aug 10 07:08:56 UTC 2021 - pgajdos@suse.com diff --git a/latex2html.spec b/latex2html.spec index 12ec44d..7974788 100644 --- a/latex2html.spec +++ b/latex2html.spec @@ -1,7 +1,7 @@ # # spec file for package latex2html # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,19 +19,21 @@ %define share_dir %{_datadir}/latex2html %define _texmfmaindir %{_datadir}/texmf Name: latex2html -Version: 2021.2 +Version: 2022 Release: 0 Summary: LaTeX to HTML Converter License: GPL-2.0-or-later Group: Productivity/Publishing/TeX/Utilities URL: https://github.com/latex2html/latex2html/ -Source0: https://github.com/latex2html/latex2html/archive/v%{version}.tar.gz -Source1: latex2html-manual.tar.bz2 +Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +# PATCH-FIX-OPENSUSE latex2html-share-dir.diff -- Fix latex2html share dir location, use /usr/share not /usr/share/lib Patch0: latex2html-share-dir.diff +# PATCH-FIX-UPSTREAM latex2html-perl-bindir.diff -- Fix shbang to use /usr/bin not /usr/local/bin Patch1: latex2html-perl-bindir.diff +# PATCH-FEATURE-UPSTREAM latex2html-dest-dir.diff -- Support DESTDIR variable while installing Patch2: latex2html-dest-dir.diff +# PATCH-FIX-UPSTREAM latex2html-binmode.diff -- Open files in binary mode, required for UTF-8 files Patch3: latex2html-binmode.diff -Patch4: latex2html-backref-workaround.diff BuildRequires: fdupes BuildRequires: ghostscript-fonts-std BuildRequires: ghostscript-x11 @@ -70,17 +72,21 @@ Group: Productivity/Publishing/TeX/Utilities This subpackage contains the documentation for the Latex2HTML converter. %prep -%setup -q -a 1 +%setup -q %patch0 %patch1 %patch2 %patch3 -%patch4 %build # Not autotools based configure ./configure --prefix=%{_prefix} %make_build +# Build docs +export LATEX2HTMLDIR=$(pwd) +cd docs +make L2H="../latex2html -nouse_pdftex -test_mode" html +find manual -name "*.old" -delete %install %make_install @@ -92,7 +98,7 @@ chmod 755 %{buildroot}%{_datadir}/%{name}/{cweb2html/makemake.pl,cweb2html/cweb2 %check %make_build test -find manual tests \( -name \*.log -o -name \*.aux -o -name WARNINGS \) -delete +find docs/manual tests \( -name \*.log -o -name \*.aux -o -name WARNINGS \) -delete %files %doc Changes FAQ README.md TODO dot.latex2html-init @@ -121,7 +127,7 @@ find manual tests \( -name \*.log -o -name \*.aux -o -name WARNINGS \) -delete %{share_dir}/icons/*.png %files doc -%doc manual +%doc docs/manual %doc tests %doc example diff --git a/v2021.2.tar.gz b/v2021.2.tar.gz deleted file mode 100644 index b6a6f89..0000000 --- a/v2021.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:892714d87d2ab357488679bda91ae1333b1da6d9743fd42443cc71aaf069cb83 -size 1139791