From 6e1b9ad504d5aad4cecdd21c55754dbecbd97989 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 26 Jun 2017 14:04:30 -0400 Subject: [PATCH] 2017.2 --- .gitignore | 2 ++ latex2html-2002.2.1-grayimg.patch | 11 ----------- latex2html.spec | 29 +++++++++-------------------- sources | 6 +++--- 4 files changed, 14 insertions(+), 34 deletions(-) delete mode 100644 latex2html-2002.2.1-grayimg.patch diff --git a/.gitignore b/.gitignore index 5440736..9b88f0a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /l2h-2K8-jp20081220.tar.gz /latex2html-manpages.tar.gz /latex2html-2012.tgz +/latex2html-2017.2.tar.gz +/l2h-2016-jp20160826.tar.gz diff --git a/latex2html-2002.2.1-grayimg.patch b/latex2html-2002.2.1-grayimg.patch deleted file mode 100644 index 329359d..0000000 --- a/latex2html-2002.2.1-grayimg.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- latex2html-2002-2-1/pstoimg.pin.grayimg 2005-05-04 11:20:46.000000000 +0200 -+++ latex2html-2002-2-1/pstoimg.pin 2005-06-21 14:54:30.899550448 +0200 -@@ -1021,7 +1021,7 @@ sub ps2pnm { - } - my $had_nonwhite; - if($opt{white}) { -- $had_nonwhite = ($ps =~ s/(\n\d+ \d+ bop gsave) \d*\.\d+ (TeXcolorgray clippath fill grestore)/$1 1 $2/s); -+ $had_nonwhite = ($ps =~ s/(\d+ \d+ bop gsave) \d*\.\d+ (TeXcolorgray clippath fill grestore)/$1 1 $2/s); - } - $ps_changed = $had_papersize || $had_nonwhite; - if($ps_changed) { diff --git a/latex2html.spec b/latex2html.spec index 00f629e..f05c76a 100644 --- a/latex2html.spec +++ b/latex2html.spec @@ -2,26 +2,24 @@ Summary: Converts LaTeX documents to HTML Name: latex2html -Version: 2012 -Release: 8%{?dist} +Version: 2017.2 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Publishing URL: http://www.latex2html.org/ # main latex2html source -Source0: http://mirrors.ctan.org/support/latex2html/%{name}-%{version}.tgz +Source0: http://mirrors.ctan.org/support/latex2html/%{name}-%{version}.tar.gz Source1: cfgcache.pm Source2: %{name}-manpages.tar.gz # support for Japanese -Source3: http://takeno.iee.niit.ac.jp/~shige/TeX/latex2html/current/data/l2h-2K8-jp20081220.tar.gz +Source3: http://takeno.iee.niit.ac.jp/~shige/TeX/latex2html/data2/l2h-2016-jp20160826.tar.gz Patch0: latex2html-2K.1beta-tabularx.patch Patch1: teTeX-l2h-config.patch Patch3: latex2html-2K.1beta-DB.patch Patch4: latex2html-2002-2-1-SHLIB.patch Patch5: latex2html-2002-2-1-gsfont.patch -Patch6: latex2html-2002.2.1-grayimg.patch Requires: tex(latex), tex(dvips), tex(url.sty), netpbm-progs BuildRequires: perl >= 5.003, perl-generators, ghostscript >= 4.03, netpbm-progs >= 9.21, tex(latex) -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %description @@ -66,12 +64,6 @@ tar fxz %{SOURCE3} popd %endif -pushd %{name}-%{version} -# don't generate gray images as output from latex2html -# it's patched here to let the .jp2 patch be cleanly applied -%patch6 -p1 -b .grayimg -popd - %build pushd %{name}-%{version} cp %{SOURCE1} cfgcache.pm @@ -134,8 +126,6 @@ popd %endif %install -rm -rf %{buildroot} - pushd %{name}-%{version} perl -pi -e"s,%{_prefix},%{buildroot}%{_prefix}," cfgcache.pm perl -pi -e"s,/.*\\\${dd}texexpand,%{_bindir}/texexpand,; @@ -197,9 +187,6 @@ done # do not clash with texlive, prefer url.sty from texlive instead rm -f %{buildroot}%{_datadir}/texmf/tex/latex/html/url.sty -%clean -rm -rf %{buildroot} - %post [ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || : @@ -207,8 +194,7 @@ rm -rf %{buildroot} [ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || : %files -%defattr(-,root,root,-) -%doc latex2html-%{version}/{LICENSE,LICENSE.orig,README,FAQ,BUGS,docs,example} +%doc latex2html-%{version}/{LICENSE,LICENSE.orig,README.md,FAQ,BUGS,docs,example} %{_bindir}/latex2html %{_bindir}/pstoimg %{_bindir}/texexpand @@ -230,6 +216,9 @@ rm -rf %{buildroot} %{_mandir}/man1/pstoimg.* %changelog +* Mon Jun 26 2017 Tom Callaway 2017.2-1 +- update to 2017.2 + * Fri Feb 10 2017 Fedora Release Engineering - 2012-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild @@ -322,7 +311,7 @@ rm -rf %{buildroot} * Tue May 3 2005 Jindrich Novy 2002.2.1-2 - run texhash in the %%post and %%postun phase (#156660) -* Fri Mar 15 2005 Jindrich Novy 2002.2.1-1 +* Tue Mar 15 2005 Jindrich Novy 2002.2.1-1 - create backups for patches - update Source1 - BuildArchitectures -> BuildArch diff --git a/sources b/sources index fa3778f..3bbd924 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -7951e334e313a1a88946a1171c72e78f l2h-2K8-jp20081220.tar.gz -a27170c02c0f2bc3a524058711e339a4 latex2html-manpages.tar.gz -4939a3f6abb13cdc9904d1555ac8e250 latex2html-2012.tgz +SHA512 (latex2html-2017.2.tar.gz) = 0e1ab1b2005dc71988b1500884d7a13bfbdce73a62ef7f6cc6e83e29d776c98eb09cff3f8d0c162493586094c9ca6f07d47e98d2137f223f27044d03e9bb3473 +SHA512 (l2h-2016-jp20160826.tar.gz) = 29f719a8db7dababafeadd20017f0491583d3d1be65e7ebd9105d772f59134833b2e4f7dbcdfde75f7122a801653ccdc637a9851c335fc5628c098f3d8fc2400 +SHA512 (latex2html-manpages.tar.gz) = 113fdc27c9ab5c2d7ef76c86eb5b55bccf30077e987fd1645ae9c8f96d037372d9446b13d73b2ad3cf7655787366ac7ee8899db8682e354fe3a1acec4e92b829