Accepting request 180892 from Publishing
- use \g syntax for \8 and \9 regexp backrefs to work around - add latex2html-fix-defined.patch from debian bug tracker to avoid - add apparmor's tex docu for better %check: testfile.tex OBS-URL: https://build.opensuse.org/request/show/180892 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/latex2html?expand=0&rev=24
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
9ebd147201
20
latex2html-backref-workaround.diff
Normal file
20
latex2html-backref-workaround.diff
Normal file
@ -0,0 +1,20 @@
|
||||
--- ./latex2html.pin.orig 2013-06-25 14:57:10.000000000 +0000
|
||||
+++ ./latex2html.pin 2013-06-25 14:57:27.000000000 +0000
|
||||
@@ -16557,7 +16557,7 @@ sub make_isolatin1_rx {
|
||||
$caption_suffixes = "lof|lot";
|
||||
# $caption_rx = "\\\\caption\\s*([[]\\s*((($any_next_pair_rx5)|([[][^]]*[]])|[^]])*)[]])?$O(\\d+)$C([\\s\\S]*)$O\\8$C$EOL";
|
||||
|
||||
- $caption_rx = "\\\\(top|bottom|table)?caption\\s*\\\*?\\s*([[]\\s*((($any_next_pair_rx6)|([[][^]]*[]])|[^]])*)[]])?$O(\\d+)$C([\\s\\S]*)$O\\9$C$EOL";
|
||||
+ $caption_rx = "\\\\(top|bottom|table)?caption\\s*\\\*?\\s*([[]\\s*((($any_next_pair_rx6)|([[][^]]*[]])|[^]])*)[]])?$O(\\d+)$C([\\s\\S]*)$O\\g9$C$EOL";
|
||||
$caption_width_rx = "\\\\setlength\\s*(($O|$OP)\\d+($C|$CP))\\\\captionwidth\\1\\s*(($O|$OP)\\d+($C|$CP))([^>]*)\\4";
|
||||
|
||||
# Matches the \htmlimage command
|
||||
@@ -16622,7 +16622,7 @@ sub make_isolatin1_rx {
|
||||
|
||||
# Matches a label command and its argument
|
||||
$labels_rx = "\\\\label\\s*$O(\\d+)$C([\\s\\S]*)$O\\1$C$EOL";
|
||||
- $labels_rx8 = "\\\\label\\s*$O(\\d+)$C([\\s\\S]*)$O\\8$C$EOL";
|
||||
+ $labels_rx8 = "\\\\label\\s*$O(\\d+)$C([\\s\\S]*)$O\\g8$C$EOL";
|
||||
|
||||
# Matches environments that should not be touched during the translation
|
||||
# $verbatim_env_rx = "\\s*{(verbatim|rawhtml|LVerbatim)[*]?}";
|
||||
37
latex2html-fix-defined.patch
Normal file
37
latex2html-fix-defined.patch
Normal file
@ -0,0 +1,37 @@
|
||||
Description: Fix perl warning about deprecated "defined(%hash)"
|
||||
latex2html with current perl gives warnings about the deprecation of
|
||||
"defined(%hash)". This patches removes them by just removing the resp.
|
||||
keyword.
|
||||
Author: Roland Stigge <stigge@antcom.de>
|
||||
|
||||
Index: latex2html-2008-debian1/latex2html.pin
|
||||
===================================================================
|
||||
--- latex2html-2008-debian1.orig/latex2html.pin 2010-07-31 16:13:21.000000000 +0200
|
||||
+++ latex2html-2008-debian1/latex2html.pin 2012-04-09 17:21:52.000000000 +0200
|
||||
@@ -532,7 +532,7 @@
|
||||
#
|
||||
# If possible, use icons of the same type as generated images
|
||||
#
|
||||
-if ($IMAGE_TYPE && defined %{"icons_$IMAGE_TYPE"}) {
|
||||
+if ($IMAGE_TYPE && %{"icons_$IMAGE_TYPE"}) {
|
||||
%icons = %{"icons_$IMAGE_TYPE"};
|
||||
}
|
||||
|
||||
@@ -2112,7 +2112,7 @@
|
||||
"\nCould not find translation function for $default_language.\n\n")
|
||||
}
|
||||
);
|
||||
- if ($USE_UTF ||(!$NO_UTF &&(defined %unicode_table)&&length(%unicode_table)>2)) {
|
||||
+ if ($USE_UTF ||(!$NO_UTF &&(%unicode_table)&&length(%unicode_table)>2)) {
|
||||
&convert_to_unicode($_)};
|
||||
}
|
||||
$_ = join('', @case_processed, $_); undef(@case_processed);
|
||||
@@ -9117,7 +9117,7 @@
|
||||
my ($charset) = "${CHARSET}_character_map_inv";
|
||||
$charset =~ s/-/_/g;
|
||||
# convert upper 8-bit characters
|
||||
- if (defined %$charset &&($CHARSET =~ /8859[_\-]1$/)) {
|
||||
+ if (%$charset &&($CHARSET =~ /8859[_\-]1$/)) {
|
||||
s/([\200-\377])/
|
||||
$tmp = $$charset{'&#'.ord($1).';'};
|
||||
&mark_string($tmp) if ($tmp =~ m!\{!);
|
||||
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 25 16:58:46 CEST 2013 - mls@suse.de
|
||||
|
||||
- use \g syntax for \8 and \9 regexp backrefs to work around
|
||||
a bug in perl-5.18
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 25 09:47:55 UTC 2013 - coolo@suse.com
|
||||
|
||||
- add latex2html-fix-defined.patch from debian bug tracker to avoid
|
||||
a warning
|
||||
- add apparmor's tex docu for better %check: testfile.tex
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 11 07:59:19 UTC 2013 - mmeister@suse.com
|
||||
|
||||
|
||||
@ -44,12 +44,15 @@ Source: http://www.latex2html.org/~latex2ht/current/%{name}-%{version}.t
|
||||
Source1: latex2html-manual.ps.gz
|
||||
Source2: latex2html-manual.tar.bz2
|
||||
Source3: latex2html-README.SuSE
|
||||
Source4: testfile.tex
|
||||
Patch: latex2html-%{version}.diff
|
||||
Patch1: latex2html-%{version}-binmode.diff
|
||||
Patch2: latex2html-%{version}-gsout.diff
|
||||
Patch3: latex2html-%{version}-buildroot.diff
|
||||
Patch4: latex2html-%{version}-perl-bindir.diff
|
||||
Patch5: latex2html-%{version}-match-multiline.patch
|
||||
Patch6: http://patch-tracker.debian.org/patch/series/dl/latex2html/2008-debian1-9/latex2html-fix-defined.patch
|
||||
Patch7: latex2html-backref-workaround.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
@ -59,14 +62,6 @@ LaTeX texts.
|
||||
|
||||
Find documentation in /usr/share/doc/packages/latex2html.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Jens Lippmann <lippmann@cdc.informatik.tu-darmstadt.de>
|
||||
Nikos Drakos <nikos@cbl.leeds.ac.uk>
|
||||
Ross Moore <ross@mpce.mq.edu.au>
|
||||
|
||||
%package pngicons
|
||||
Provides: l2h-pngicons
|
||||
Obsoletes: l2h-pngicons
|
||||
@ -77,14 +72,6 @@ Group: Productivity/Publishing/TeX/Utilities
|
||||
%description pngicons
|
||||
Icons in the PNG format for the LaTeX to HTML Converter.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Jens Lippmann <lippmann@cdc.informatik.tu-darmstadt.de>
|
||||
Nikos Drakos <nikos@cbl.leeds.ac.uk>
|
||||
Ross Moore <ross@mpce.mq.edu.au>
|
||||
|
||||
%package doc
|
||||
Summary: LaTeX2HTML Converter
|
||||
License: GPL-2.0+ and LPPL-1.3c
|
||||
@ -95,16 +82,6 @@ LaTeX2HTML lets you easily convert basic LaTeX documents into the HTML
|
||||
format. This allows both a written and online version even of older
|
||||
LaTeX texts.
|
||||
|
||||
Find documentation in /usr/share/doc/packages/latex2html.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Jens Lippmann <lippmann@cdc.informatik.tu-darmstadt.de>
|
||||
Nikos Drakos <nikos@cbl.leeds.ac.uk>
|
||||
Ross Moore <ross@mpce.mq.edu.au>
|
||||
|
||||
%prep
|
||||
%setup
|
||||
%setup -a 2
|
||||
@ -114,6 +91,8 @@ Authors:
|
||||
%patch3
|
||||
%patch4
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7
|
||||
cp %{S:1} manual.ps.gz
|
||||
cp %{S:3} README.SuSE
|
||||
|
||||
@ -134,8 +113,8 @@ chmod 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/{cweb2html/makemake.pl,cweb2html/cw
|
||||
rm $RPM_BUILD_ROOT/usr/lib/texmf/tex/latex/html/url.sty
|
||||
%fdupes -s $RPM_BUILD_ROOT
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
%check
|
||||
LATEX2HTMLDIR=%buildroot/%{share_dir} ./latex2html --test_mode %{S:4}
|
||||
|
||||
%postun
|
||||
mkdir -p var/adm/SuSEconfig
|
||||
|
||||
1303
testfile.tex
Normal file
1303
testfile.tex
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user