Update to latest upstream release

This commit is contained in:
Ben Cotton 2018-08-13 08:45:36 -04:00
parent 230b17fab0
commit a9b4c1c229
5 changed files with 11 additions and 64 deletions

2
.gitignore vendored
View File

@ -5,3 +5,5 @@
/l2h-2016-jp20160826.tar.gz /l2h-2016-jp20160826.tar.gz
/latex2html-2018.2.tar.gz /latex2html-2018.2.tar.gz
/l2h-2017-jp20180308.tar.gz /l2h-2017-jp20180308.tar.gz
/latex2html-2018.3.tar.gz
/l2h-2018-jp20180813.tar.gz

View File

@ -1,32 +0,0 @@
From ead9c5ade86d90b07f778b2fcb972f273d52c3c2 Mon Sep 17 00:00:00 2001
From: Dan Gildea <dgildea>
Date: Thu, 24 May 2018 14:01:34 -0400
Subject: [PATCH] escape var in regexp
Fixes #48
---
latex2html.pin | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/latex2html.pin b/latex2html.pin
index 116473f..398b3db 100755
--- a/latex2html.pin
+++ b/latex2html.pin
@@ -4627,7 +4627,7 @@ sub balance_tags {
$save_tags = join(',',@save_open_tags) if (@save_open_tags);
$open_tags = join(',',@$open_tags_R) if (@$open_tags_R);
if ($open_tags eq $save_tags) { return(); }
- if ($save_tags =~ s/^$open_tags//) {
+ if ($save_tags =~ s/^\Q$open_tags\E//) {
@reopen_tags = split (',',$');
} else {
@reopen_tags = @save_open_tags;
@@ -4637,7 +4637,7 @@ sub balance_tags {
$declarations{$tag_cmd} =~ m|</.*$|;
$tags .= $& unless ($` =~ /^<>$/);
$open_tags = join(',',@$open_tags_R) if (@$open_tags_R);
- last if ( $save_tags =~ s/^$open_tags/
+ last if ( $save_tags =~ s/^\Q$open_tags\E/
@reopen_tags = split (',',$');''/e);
}
}

View File

@ -1,20 +0,0 @@
From 78c9a4d6be6c403f2fbe4174a40a7a6585493793 Mon Sep 17 00:00:00 2001
From: Dan Gildea <dgildea>
Date: Thu, 24 May 2018 14:05:27 -0400
Subject: [PATCH] \usepackage{xcolor}
just loads "color" package
---
styles/xcolor.perl | 3 +++
1 file changed, 3 insertions(+)
create mode 100644 styles/xcolor.perl
diff --git a/styles/xcolor.perl b/styles/xcolor.perl
new file mode 100644
index 0000000..90ace0a
--- /dev/null
+++ b/styles/xcolor.perl
@@ -0,0 +1,3 @@
+do_require_package('color');
+
+1;

View File

@ -2,8 +2,8 @@
Summary: Converts LaTeX documents to HTML Summary: Converts LaTeX documents to HTML
Name: latex2html Name: latex2html
Version: 2018.2 Version: 2018.3
Release: 4%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/Publishing Group: Applications/Publishing
URL: http://www.latex2html.org/ URL: http://www.latex2html.org/
@ -12,13 +12,11 @@ Source0: http://mirrors.ctan.org/support/latex2html/%{name}-%{version}.tar.gz
Source1: cfgcache.pm Source1: cfgcache.pm
Source2: %{name}-manpages.tar.gz Source2: %{name}-manpages.tar.gz
# support for Japanese # support for Japanese
Source3: http://takeno.iee.niit.ac.jp/~shige/TeX/latex2html/data2/l2h-2017-jp20180308.tar.gz Source3: http://takeno.iee.niit.ac.jp/~shige/TeX/latex2html/data2/latex2html-2018.tar.gz
Patch0: latex2html-2K.1beta-tabularx.patch Patch0: latex2html-2K.1beta-tabularx.patch
Patch1: latex2html-2018.2-teTeX-l2h-config.patch Patch1: latex2html-2018.2-teTeX-l2h-config.patch
Patch4: latex2html-2002-2-1-SHLIB.patch Patch4: latex2html-2002-2-1-SHLIB.patch
Patch5: latex2html-2002-2-1-gsfont.patch Patch5: latex2html-2002-2-1-gsfont.patch
Patch6: latex2html-issue48-1.patch
Patch7: latex2html-issue48-2.patch
Requires: tex(latex), tex(dvips), tex(url.sty), netpbm-progs 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) BuildRequires: perl-interpreter >= 5.003, perl-generators, ghostscript >= 4.03, netpbm-progs >= 9.21, tex(latex)
BuildArch: noarch BuildArch: noarch
@ -47,10 +45,6 @@ pushd %{name}-%{version}
# don't require the font directory to be ended with PATH/fonts # don't require the font directory to be ended with PATH/fonts
%patch5 -p1 -b .gsfont %patch5 -p1 -b .gsfont
# Patch Perl compatibility. Fixes are upstream but not yet released
%patch6 -p1
%patch7 -p1
# remove all platforms we don't need # remove all platforms we don't need
for i in Dos Mac OS2 Win32; do for i in Dos Mac OS2 Win32; do
rm -f L2hos/${i}.pm rm -f L2hos/${i}.pm
@ -227,10 +221,13 @@ make -C %{name}-%{version}JA check
%{_mandir}/man1/pstoimg.* %{_mandir}/man1/pstoimg.*
%changelog %changelog
* 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 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2018.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Jul 07 2018 Ben Cotton <bcotton@fedoraproject.org> - 2018.2-3 * 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 - 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 * Fri Jun 22 2018 Than Ngo <than@redhat.com> - 2018.2-2

View File

@ -1,3 +1,3 @@
SHA512 (l2h-2018-jp20180813.tar.gz) = b6e53f359e13ad03e096c62f00bc11f91cf72260727f8acc98da5ec455f63d38f1888f38464965d0c375da9b3d48d991013d7b0a37acecd93b5cb9ec7291ac2c
SHA512 (latex2html-manpages.tar.gz) = 113fdc27c9ab5c2d7ef76c86eb5b55bccf30077e987fd1645ae9c8f96d037372d9446b13d73b2ad3cf7655787366ac7ee8899db8682e354fe3a1acec4e92b829 SHA512 (latex2html-manpages.tar.gz) = 113fdc27c9ab5c2d7ef76c86eb5b55bccf30077e987fd1645ae9c8f96d037372d9446b13d73b2ad3cf7655787366ac7ee8899db8682e354fe3a1acec4e92b829
SHA512 (latex2html-2018.2.tar.gz) = 62c7f3de9dbcb43b69b8d7b71dc9200a02100a8ac9ce027a741a448b24b4e20b6ba7ae870a9d154527ef6124c660bac53868a4de9a365bd790a18ad01a5f6f36 SHA512 (latex2html-2018.3.tar.gz) = 01925a69673e8a824f9b6608cd9b84ad54ea6f0058ff9374a5312e40a731ba8ad56cc22cfeaa5499c2083c6883579034bbeb9f5bb90b32bcc5bcd7136f24a934
SHA512 (l2h-2017-jp20180308.tar.gz) = 57dfdaf6a3ab3098b728385b842bd6c6d4266724d870763390ba04474cd735beb5abbb66e545234853f63cdd38eb5c427cec0a9cc96997a011ad7d480b56184a