Compare commits

...

No commits in common. "c8s" and "c9" have entirely different histories.
c8s ... c9

5 changed files with 61 additions and 56 deletions

4
.gitignore vendored
View File

@ -1,3 +1,3 @@
SOURCES/l2h-2017-jp20180308.tar.gz
SOURCES/latex2html-2018.2.tar.gz
SOURCES/l2h-2020-jp20200515.tar.gz
SOURCES/latex2html-manpages.tar.gz
SOURCES/v2020.2.tar.gz

View File

@ -1,3 +1,3 @@
0d9348f534e85f2776c35ab86174ca3317656cfa SOURCES/l2h-2017-jp20180308.tar.gz
ae16976d724a39363f74ad4a269305b06a9bfe54 SOURCES/latex2html-2018.2.tar.gz
583ed23367ca6f717e9be9485b9eb1ace959083f SOURCES/l2h-2020-jp20200515.tar.gz
e87245982fd87931dc32b703cefc88dad6450681 SOURCES/latex2html-manpages.tar.gz
5e5eaa1e3c32e6f65590177ec1dd3adaa21e7a13 SOURCES/v2020.2.tar.gz

View File

@ -1,11 +0,0 @@
--- 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;

View File

@ -1,26 +0,0 @@
--- 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 .= "<COL ALIGN=RIGHT>";
push(@colspec,"$cellopen=RIGHT NOWRAP>$content_mark$cellclose");
$cols++;
+ } elsif ( $char eq "X" ) {
+ $htmlcolspec .= "<COL ALIGN=JUSTIFY>";
+ 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 {

View File

@ -2,23 +2,25 @@
Summary: Converts LaTeX documents to HTML
Name: latex2html
Version: 2018.2
Release: 2%{?dist}
Version: 2020.2
Release: 5%{?dist}
License: GPLv2+
Group: Applications/Publishing
URL: http://www.latex2html.org/
URL: https://github.com/latex2html/latex2html/releases
# main latex2html source
Source0: http://mirrors.ctan.org/support/latex2html/%{name}-%{version}.tar.gz
Source0: https://github.com/latex2html/latex2html/archive/v%{version}.tar.gz
Source1: cfgcache.pm
Source2: %{name}-manpages.tar.gz
# support for Japanese
Source3: http://takeno.iee.niit.ac.jp/~shige/TeX/latex2html/data2/l2h-2017-jp20180308.tar.gz
Patch0: latex2html-2K.1beta-tabularx.patch
# http://takeno.iee.niit.ac.jp/~shige/TeX/latex2html/
Source3: http://takeno.iee.niit.ac.jp/~shige/TeX/latex2html/data2/l2h-2020-jp20200515.tar.gz
Patch1: latex2html-2018.2-teTeX-l2h-config.patch
Patch4: latex2html-2002-2-1-SHLIB.patch
Patch5: latex2html-2002-2-1-gsfont.patch
Requires: tex(latex), tex(dvips), tex(url.sty), netpbm-progs
Requires: tex(latex), tex(dvips), tex(url.sty), tex(preview.sty), netpbm-progs
BuildRequires: perl-interpreter >= 5.003, perl-generators, ghostscript >= 4.03, netpbm-progs >= 9.21, tex(latex)
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(lib), perl(strict), perl(vars)
BuildRequires: make
BuildArch: noarch
%description
@ -33,18 +35,12 @@ pages are generated from a single LATEX source.
%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 <oliver.paukstadt@millenux.com>
%patch1 -p2 -b .config
# fix SHLIBDIR
%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
rm -f L2hos/${i}.pm
@ -221,6 +217,52 @@ make -C %{name}-%{version}JA check
%{_mandir}/man1/pstoimg.*
%changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2020.2-5
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2020.2-4
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2020.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2020.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jul 17 2020 Jindrich Novy <jnovy@redhat.com> - 2020.2-1
- update to 2020.2 and l2h-2020
* Tue Mar 24 2020 Jitka Plesnikova <jplesnik@redhat.com> - 2019.2-5
- Add perl dependencies needed for build
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2019.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Sep 16 2019 Than Ngo <than@redhat.com> - 2019.2-3
- add Requirement on tex(preview.sty)
* Wed Sep 11 2019 Than Ngo <than@redhat.com> - 2019.2-2
- update URL
* Wed Sep 11 2019 Than Ngo <than@redhat.com> - 2019.2-1
- update to v2019.2
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2018.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2018.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Aug 13 2018 Ben Cotton <bcotton@fedoraproject.org> - 2018.3-1
- Update to latest upstream version
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2018.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Jul 06 2018 Ben Cotton <bcotton@fedoraproject.org> - 2018.2-3
- Add patch to fix bz#1582267 (upstream issue 48) until next upstream release
* Fri Jun 22 2018 Than Ngo <than@redhat.com> - 2018.2-2
- update l2h-2017-jp20180308