From b304f7579619fad234061008663f81d20fa9596e Mon Sep 17 00:00:00 2001
From: Than Ngo <than@redhat.com>
Date: Fri, 22 Jun 2018 17:08:19 +0200
Subject: [PATCH] - update to 2018.2 - add check

---
 .gitignore                               |  1 +
 latex2html-2018.2-teTeX-l2h-config.patch | 11 +++++++++++
 latex2html-2K.1beta-DB.patch             | 11 -----------
 latex2html.spec                          | 20 +++++++++++++-------
 sources                                  |  2 +-
 5 files changed, 26 insertions(+), 19 deletions(-)
 create mode 100644 latex2html-2018.2-teTeX-l2h-config.patch
 delete mode 100644 latex2html-2K.1beta-DB.patch

diff --git a/.gitignore b/.gitignore
index 9b88f0a..e057e9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /latex2html-2012.tgz
 /latex2html-2017.2.tar.gz
 /l2h-2016-jp20160826.tar.gz
+/latex2html-2018.2.tar.gz
diff --git a/latex2html-2018.2-teTeX-l2h-config.patch b/latex2html-2018.2-teTeX-l2h-config.patch
new file mode 100644
index 0000000..31e279e
--- /dev/null
+++ b/latex2html-2018.2-teTeX-l2h-config.patch
@@ -0,0 +1,11 @@
+diff -up latex2html-2018.2/latex2html-2018.2/config/config.pl.me latex2html-2018.2/latex2html-2018.2/config/config.pl
+--- latex2html-2018.2/latex2html-2018.2/config/config.pl.me	2018-06-22 16:43:28.830829027 +0200
++++ latex2html-2018.2/latex2html-2018.2/config/config.pl	2018-06-22 16:43:58.532706324 +0200
+@@ -635,6 +635,7 @@ $abs_path_names = &get_name('ABSPATHS');
+ # DBM check
+ # --------------------------------------------------------------------------
+ 
++use DB;
+ &checking('if perl supports some dbm');
+ 
+ my %array;
diff --git a/latex2html-2K.1beta-DB.patch b/latex2html-2K.1beta-DB.patch
deleted file mode 100644
index 1f1ef64..0000000
--- a/latex2html-2K.1beta-DB.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- teTeX-1.0/latex2html-2K.1beta/config/config.pl.DB	Wed Jan 16 13:08:34 2002
-+++ teTeX-1.0/latex2html-2K.1beta/config/config.pl	Wed Jan 16 13:09:14 2002
-@@ -587,7 +587,7 @@
- 
- &checking('if perl supports some dbm');
- 
--use DB_File;
-+use DB;
- my %array;
- unless(eval {dbmopen(%array,'DBMtest',0755)}) {
-   my $err = $@ || 'dbmopen failed';
diff --git a/latex2html.spec b/latex2html.spec
index 95c2ad2..1909f2c 100644
--- a/latex2html.spec
+++ b/latex2html.spec
@@ -2,8 +2,8 @@
 
 Summary: Converts LaTeX documents to HTML
 Name: latex2html
-Version: 2017.2
-Release: 6%{?dist}
+Version: 2018.2
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Publishing
 URL: http://www.latex2html.org/
@@ -14,8 +14,7 @@ Source2: %{name}-manpages.tar.gz
 # support for Japanese
 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
+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
@@ -40,9 +39,6 @@ pushd %{name}-%{version}
 # Patch from Oliver Paukstadt <oliver.paukstadt@millenux.com>
 %patch1 -p2 -b .config
 
-# Fix latex2html not to use DB_File
-%patch3 -p2 -b .db_file
-
 # fix SHLIBDIR
 %patch4 -p1 -b .shlib
 
@@ -196,6 +192,12 @@ rm -f %{buildroot}%{_datadir}/texmf/tex/latex/html/url.sty
 %postun
 [ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
 
+%check
+make -C %{name}-%{version} check
+%if %{enable_japanese}
+make -C %{name}-%{version}JA check
+%endif
+
 %files
 %doc latex2html-%{version}/{LICENSE,LICENSE.orig,README.md,FAQ,BUGS,docs,example}
 %{_bindir}/latex2html
@@ -219,6 +221,10 @@ rm -f %{buildroot}%{_datadir}/texmf/tex/latex/html/url.sty
 %{_mandir}/man1/pstoimg.*
 
 %changelog
+* Fri Jun 22 2018 Than Ngo <than@redhat.com> - 2018.2-1
+- update to 2018.2
+- add check
+
 * Thu Jun 14 2018 Than Ngo <than@redhat.com> - 2017.2-6
 - fixed bz#1591144, buildroot issue
 
diff --git a/sources b/sources
index 3bbd924..a4e2d04 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (latex2html-2017.2.tar.gz) = 0e1ab1b2005dc71988b1500884d7a13bfbdce73a62ef7f6cc6e83e29d776c98eb09cff3f8d0c162493586094c9ca6f07d47e98d2137f223f27044d03e9bb3473
 SHA512 (l2h-2016-jp20160826.tar.gz) = 29f719a8db7dababafeadd20017f0491583d3d1be65e7ebd9105d772f59134833b2e4f7dbcdfde75f7122a801653ccdc637a9851c335fc5628c098f3d8fc2400
 SHA512 (latex2html-manpages.tar.gz) = 113fdc27c9ab5c2d7ef76c86eb5b55bccf30077e987fd1645ae9c8f96d037372d9446b13d73b2ad3cf7655787366ac7ee8899db8682e354fe3a1acec4e92b829
+SHA512 (latex2html-2018.2.tar.gz) = 62c7f3de9dbcb43b69b8d7b71dc9200a02100a8ac9ce027a741a448b24b4e20b6ba7ae870a9d154527ef6124c660bac53868a4de9a365bd790a18ad01a5f6f36