diff --git a/.gitignore b/.gitignore index f6a3a77..b90a771 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,10 @@ -/*.tar.gz +/l2h-2K8-jp20081220.tar.gz +/latex2html-manpages.tar.gz +/latex2html-2012.tgz +/latex2html-2017.2.tar.gz +/l2h-2016-jp20160826.tar.gz +/latex2html-2018.2.tar.gz +/l2h-2017-jp20180308.tar.gz +/latex2html-2018.3.tar.gz +/l2h-2018-jp20180813.tar.gz +/latex2html-2018.tar.gz diff --git a/cfgcache.pm b/cfgcache.pm index cea2f57..7a4b503 100644 --- a/cfgcache.pm +++ b/cfgcache.pm @@ -28,7 +28,7 @@ $cfg{'HTML_VALIDATOR'} = q''; $cfg{'ICONPATH'} = q'file:/usr/share/latex2html/icons'; $cfg{'ICONSERVER'} = q''; $cfg{'ICONSTORAGE'} = q''; -$cfg{'IMAGE_TYPES'} = q'svg png gif'; +$cfg{'IMAGE_TYPES'} = q'png gif'; $cfg{'INITEX'} = q'/usr/bin/initex'; $cfg{'JPEGTOPNM'} = q'/usr/bin/jpegtopnm'; $cfg{'KPSEWHICH'} = q'/usr/bin/kpsewhich'; diff --git a/latex2html-2002-2-1-gsfont.patch b/latex2html-2002-2-1-gsfont.patch new file mode 100644 index 0000000..d098505 --- /dev/null +++ b/latex2html-2002-2-1-gsfont.patch @@ -0,0 +1,11 @@ +--- latex2html-2002-2-1/config/config.pl.gsfont 2002-09-28 07:15:01.000000000 +0200 ++++ latex2html-2002-2-1/config/config.pl 2005-03-16 10:50:17.392513136 +0100 +@@ -1176,7 +1176,7 @@ + push(@right_paths,L2hos->path2os($testpath)); + $gs_lib = 1; + } +- $testpath .= "${dd}fonts" unless($testpath =~ /\Q$dd\Efonts$/i); ++ $testpath .= "${dd}fonts" unless($testpath =~ /\Q$dd\Efonts/i); + if(!$gs_fonts && -d $testpath) { + push(@right_paths,L2hos->path2os($testpath)); + $gs_fonts = 1; diff --git a/latex2html-2K.1beta-tabularx.patch b/latex2html-2K.1beta-tabularx.patch new file mode 100644 index 0000000..90ed3be --- /dev/null +++ b/latex2html-2K.1beta-tabularx.patch @@ -0,0 +1,26 @@ +--- latex2html-2K.1beta/versions/table.pl.tabularx Fri Nov 14 11:10:52 1997 ++++ latex2html-2K.1beta/versions/table.pl Wed Jan 24 15:11:01 2001 +@@ -121,6 +121,10 @@ + $htmlcolspec .= ""; + push(@colspec,"$cellopen=RIGHT NOWRAP>$content_mark$cellclose"); + $cols++; ++ } elsif ( $char eq "X" ) { ++ $htmlcolspec .= ""; ++ push(@colspec,"$cellopen=LEFT>$content_mark$cellclose"); ++ $cols++; + } elsif ( $char eq "p" ) { + $colspec =~ s/$next_pair_rx//; + ($pts,$len) = &convert_length($2); +@@ -170,7 +174,11 @@ + local($_) = @_; + s/$next_pair_rx//; + local($pts,$len) = &convert_length($2); +- &do_env_tabular($_," width=$pts"); ++ if ($pts != "") { ++ &do_env_tabular($_," width=$pts"); ++ } else { ++ &do_env_tabular($_); ++ } + } + + sub do_env_tabular { diff --git a/latex2html.spec b/latex2html.spec index 520bf65..3762cd0 100644 --- a/latex2html.spec +++ b/latex2html.spec @@ -1,31 +1,23 @@ -%if 0%{?fedora} %define enable_japanese 1 -%else -%define enable_japanese 0 -%endif Summary: Converts LaTeX documents to HTML Name: latex2html -Version: 2026 +Version: 2018.3 Release: 2%{?dist} -License: GPL-2.0-or-later -URL: https://github.com/latex2html/latex2html/releases +License: GPLv2+ +URL: http://www.latex2html.org/ # main latex2html source -Source0: https://github.com/%{name}/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz +Source0: http://mirrors.ctan.org/support/latex2html/%{name}-%{version}.tar.gz Source1: cfgcache.pm Source2: %{name}-manpages.tar.gz # support for Japanese -# http://takeno.iee.niit.ac.jp/~shige/TeX/latex2html/ -Source3: http://takeno.iee.niit.ac.jp/~shige/TeX/latex2html/data2/l2h-2026-jp3.2b1.43.tar.gz +Source3: http://takeno.iee.niit.ac.jp/~shige/TeX/latex2html/data2/latex2html-2018.tar.gz +Patch0: latex2html-2K.1beta-tabularx.patch Patch1: latex2html-2018.2-teTeX-l2h-config.patch -Patch2: latex2html-2002-2-1-SHLIB.patch -Requires: tex(latex), tex(dvips), tex(url.sty), tex(preview.sty), netpbm-progs, poppler-utils -BuildRequires: tex(latex), tex(dvips), tex(url.sty), tex(preview.sty), netpbm-progs, poppler-utils -BuildRequires: perl-interpreter >= 5.003, perl-generators, ghostscript >= 4.03 -BuildRequires: perl(Carp), perl(Config), perl(Cwd), perl(DB), perl(Exporter), -BuildRequires: perl(File::Copy), perl(FindBin), perl(IO::File), perl(Sys::Hostname) -BuildRequires: perl(Unicode::Collate::Locale), perl(lib), perl(strict), perl(vars) -BuildRequires: make +Patch4: latex2html-2002-2-1-SHLIB.patch +Patch5: latex2html-2002-2-1-gsfont.patch +Requires: tex(latex), tex(dvips), tex(url.sty), netpbm-progs +BuildRequires: perl-interpreter >= 5.003, perl-generators, ghostscript >= 4.03, netpbm-progs >= 9.21, tex(latex) BuildArch: noarch %description @@ -37,14 +29,20 @@ LATEX2HTML does also a good job in rapid web site deployment. These pages are generated from a single LATEX source. %prep -%setup -q -c -a 0 +%setup -q -n %{name}-%{version} -c -a 0 pushd %{name}-%{version} +# patch latex2html to support tabularx environments better +%patch0 -p1 -b .tabularx + # Patch from Oliver Paukstadt -%patch -P1 -p2 -b .config +%patch1 -p2 -b .config # fix SHLIBDIR -%patch -P2 -p1 -b .shlib +%patch4 -p1 -b .shlib + +# don't require the font directory to be ended with PATH/fonts +%patch5 -p1 -b .gsfont # remove all platforms we don't need for i in Dos Mac OS2 Win32; do @@ -200,7 +198,7 @@ make -C %{name}-%{version}JA check %endif %files -%doc latex2html-%{version}/{LICENSE,README.md,FAQ,BUGS,docs,example} +%doc latex2html-%{version}/{LICENSE,LICENSE.orig,README.md,FAQ,BUGS,docs,example} %{_bindir}/latex2html %{_bindir}/pstoimg %{_bindir}/texexpand @@ -222,81 +220,6 @@ make -C %{name}-%{version}JA check %{_mandir}/man1/pstoimg.* %changelog -* Thu Jul 16 2026 Fedora Release Engineering - 2026-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Tue Jun 09 2026 Than Ngo - 2026-1 -- Update to 2026 - -* Fri Jan 16 2026 Fedora Release Engineering - 2023.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Thu Jul 24 2025 Fedora Release Engineering - 2023.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Jan 17 2025 Fedora Release Engineering - 2023.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Tue Nov 12 2024 Than Ngo - 2023.2-6 -- Remove .orig files - -* Thu Jul 18 2024 Fedora Release Engineering - 2023.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 2023.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 2023.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jul 20 2023 Fedora Release Engineering - 2023.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jul 18 2023 Than Ngo - 2023.2-1 -- update to 2023.2 - -* Mon Jan 30 2023 Ben Cotton - 2020.2-8 -- Update License field to match SPDX formatting - -* Thu Jan 19 2023 Fedora Release Engineering - 2020.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 2020.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 2020.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 2020.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 2020.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 2020.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 17 2020 Jindrich Novy - 2020.2-1 -- update to 2020.2 and l2h-2020 - -* Tue Mar 24 2020 Jitka Plesnikova - 2019.2-5 -- Add perl dependencies needed for build - -* Wed Jan 29 2020 Fedora Release Engineering - 2019.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Sep 16 2019 Than Ngo - 2019.2-3 -- add Requirement on tex(preview.sty) - -* Wed Sep 11 2019 Than Ngo - 2019.2-2 -- update URL - -* Wed Sep 11 2019 Than Ngo - 2019.2-1 -- update to v2019.2 - -* Thu Jul 25 2019 Fedora Release Engineering - 2018.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - * Fri Feb 01 2019 Fedora Release Engineering - 2018.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index ddc5ccf..1ef06a6 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ +SHA512 (latex2html-2018.tar.gz) = b6e53f359e13ad03e096c62f00bc11f91cf72260727f8acc98da5ec455f63d38f1888f38464965d0c375da9b3d48d991013d7b0a37acecd93b5cb9ec7291ac2c SHA512 (latex2html-manpages.tar.gz) = 113fdc27c9ab5c2d7ef76c86eb5b55bccf30077e987fd1645ae9c8f96d037372d9446b13d73b2ad3cf7655787366ac7ee8899db8682e354fe3a1acec4e92b829 -SHA512 (l2h-2026-jp3.2b1.43.tar.gz) = 4b7c9424d462329173a883fff7ef330222440be132ec9190c9c06798e2d6ef1ec7f14bdb375db0742181e1f661f153e7fa002d786c4b5632d0f28a598543f713 -SHA512 (latex2html-2026.tar.gz) = e607bc637fd8c618db30d967c298a5f5d2e58846a7f32705ef8d58efa87bdea3f012d9852e6a0305f6c5698a9ebe427e71bf0a3b39584923120102cc57ac272a +SHA512 (latex2html-2018.3.tar.gz) = 01925a69673e8a824f9b6608cd9b84ad54ea6f0058ff9374a5312e40a731ba8ad56cc22cfeaa5499c2083c6883579034bbeb9f5bb90b32bcc5bcd7136f24a934