Accepting request 209170 from Publishing

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/209170
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/latex2html?expand=0&rev=27
This commit is contained in:
Stephan Kulow 2013-12-05 06:13:37 +00:00 committed by Git OBS Bridge
commit 2472e13150
18 changed files with 407 additions and 495 deletions

View File

@ -1,14 +0,0 @@
--- config/install.pl
+++ config/install.pl
@@ -372,7 +372,10 @@
if($cfg{TEXPATH}) {
print "\nNote: trying to install LaTeX2HTML style files in TeX directory tree\n ($cfg{TEXPATH})\n";
- unless(mkpath($cfg{TEXPATH})) {
+ my $dest = $cfg{TEXPATH};
+ my $buildroot=$ENV{"RPM_BUILD_ROOT"};
+ $dest= "$buildroot$dest";
+ unless(mkpath($dest)) {
#my $testpath = $cfg{TEXPATH}; # to strip (latex2)html
#$testpath =~ s/[$dd$dd][^$dd$dd]*$//;
#if((-d $cfg{TEXPATH} && !-w _) || (-d $testpath && !-w _)) {

View File

@ -1,179 +0,0 @@
Index: config/config.pl
===================================================================
--- config/config.pl.orig
+++ config/config.pl
@@ -1918,7 +1918,7 @@ else {
$newcfg{'SHLIBDIR'} = $newcfg{'PREFIX'};
}
else {
- $newcfg{'SHLIBDIR'} = "$newcfg{'PREFIX'}${dd}share${dd}lib${dd}latex2html";
+ $newcfg{'SHLIBDIR'} = "$newcfg{'PREFIX'}${dd}share${dd}latex2html";
}
}
add_drive_letter($newcfg{'SHLIBDIR'});
Index: config/install.pl
===================================================================
--- config/install.pl.orig
+++ config/install.pl
@@ -406,6 +406,9 @@ exit 0;
sub install_file {
my ($src,$dest,$chmod) = @_;
+
+ my $buildroot=$ENV{"RPM_BUILD_ROOT"};
+ $dest= "$buildroot$dest";
# prepend the value of DESTDIR, for package-managers
$dest = $ENV{'DESTDIR'}.$dest if($ENV{'DESTDIR'});
Index: latex2html.man
===================================================================
--- /dev/null
+++ latex2html.man
@@ -0,0 +1,113 @@
+.00; # finish .ig
+
+'di \" finish diversion--previous line must be blank
+.nr nl 0-1 \" fake up transition to first page again
+.nr % 0 \" start at page 1
+'; __END__ ##### From here on it's a standard manual page - VERSION #####
+.TH LaTeX2HTML 1
+.AT 3
+.SH NAME
+latex2html \- translate LaTeX files to HTML (HyperText Markup Language)
+.SH SYNOPSIS
+.B
+
+latex2html
+ [-address author-address]
+ [-antialias]
+ [-antialias_text]
+ [-ascii_mode]
+ [-auto_navigation]
+ [-auto_prefix]
+ [-biblio URL]
+ [-bottom_navigation]
+ [-contents URL]
+ [-contents_in_navigation]
+ [-custom_titles]
+ [-debug]
+ [-dir output-directory]
+ [-discard]
+ [-down_title string]
+ [-down_url URL]
+ [-external_file filename]
+ [-external_images]
+ [-font_size size]
+ [-h(elp)]
+ [-html_version (2.0|3.0|3.2)[,(math|i18n|table)]*]
+ [-images_only]
+ [-index URL]
+ [-index_in_navigation]
+ [-info string]
+ [-init_file file]
+ [-iso_language type]
+ [-ldump]
+ [-link num]
+ [-local_icons]
+ [-long_titles num]
+ [-next_page_in_navigation]
+ [-no_antialias]
+ [-no_antialias_text]
+ [-no_auto_link]
+ [-no_footnode]
+ [-no_fork]
+ [-no_images]
+ [-no_math]
+ [-no_navigation]
+ [-no_reuse]
+ [-no_subdir]
+ [-no_tex_defs]
+ [-no_white]
+ [-nolatex]
+ [-numbered_footnotes]
+ [-prefix filename-prefix]
+ [-prev_title string]
+ [-prev_url URL]
+ [-previous_page_in_navigation]
+ [-ps_images]
+ [-reuse reuse_option]
+ [-scalable_fonts]
+ [-short_extn]
+ [-short_index]
+ [-show_section_numbers]
+ [-split + num]
+ [-split num]
+ [-t top-page-title]
+ [-tmp path]
+ [-toc_depth num]
+ [-toc_stars]
+ [-top_navigation]
+ [-unsegment]
+ [-up_title string]
+ [-up_url URL]
+ [-v]
+ [-verbosity num]
+ [-white]
+ file(s)
+
+
+.SH DESCRIPTION
+.I LaTeX2HTML
+is a Perl program that translates LaTeX source files into HTML. For each source
+file given as an argument the translator will create a directory containing the
+corresponding HTML files.
+See the WWW online documentation or the /usr/share/doc/packages/latex2html/manual.ps.gz
+file for more detailed information and examples.
+
+.SH PROBLEMS
+For information on various problems and remedies see the WWW online documentation
+or the documents available in the distribution.
+A mailing list for technical discussion about latex2html, bugs and enhancements is available at
+latex2html@tug.org
+
+.SH SUSE installation
+
+In /usr/share/doc/packages/latex2html you may find more information about this package.
+
+.SH AUTHOR
+Nikos Drakos, Computer Based Learning Unit, University of Leeds
+<nikos@cbl.leeds.ac.uk>. Several people have contributed suggestions,
+ideas, solutions, support and
+encouragement.
+
+The pstogif script uses the pstoppm.ps
+postscript program originally written by Phillip Conrad (Perfect Byte, Inc.)
+and modified by L. Peter Deutsch (Aladdin Enterprises).
Index: local.pm
===================================================================
--- /dev/null
+++ local.pm
@@ -0,0 +1,29 @@
+#################################################################
+# local.pm
+#
+# Local Configuration for LaTeX2HTML
+#
+# This file is created automatically. Do not edit!
+#
+#################################################################
+
+package main;
+
+### start pstoimg configuration ###
+$GS_LIB = ' . ; /usr/share/ghostscript/5.50 ; /usr/share/ghostscript/fonts'; # Inserted by configure-pstoimg
+$GS_DEVICE = 'ppmraw'; # Inserted by configure-pstoimg
+$GS = '/usr/bin/gs'; # Inserted by configure-pstoimg
+$PNMCAT = '/usr/X11R6/bin/pnmcat'; # Inserted by configure-pstoimg
+$PNMFILE = '/usr/X11R6/bin/pnmfile'; # Inserted by configure-pstoimg
+$PNMTOPNG = '/usr/X11R6/bin/pnmtopng'; # Inserted by configure-pstoimg
+$PBMMAKE = '/usr/X11R6/bin/pbmmake'; # Inserted by configure-pstoimg
+$GSLANDSCAPE = '/usr/share/ghostscript/5.50/landscap.ps'; # Inserted by configure-pstoimg
+$PPMQUANT = '/usr/X11R6/bin/ppmquant'; # Inserted by configure-pstoimg
+$PNMFLIP = '/usr/X11R6/bin/pnmflip'; # Inserted by configure-pstoimg
+$bg_color = '\#bfbfbf'; # Inserted by configure-pstoimg
+$white_color = '\#ffffff'; # Inserted by configure-pstoimg
+$PNMCROP = '/usr/X11R6/bin/pnmcrop'; # Inserted by configure-pstoimg
+
+### end pstoimg configuration ###
+
+1;

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:59456815a3984250c295d3d5c46b85646038db8db2735cdc0d3780cf4da337ad
size 1133054

View File

@ -0,0 +1,28 @@
Index: config/install.pl
===================================================================
--- config/install.pl.orig 2002-11-29 12:49:01.000000000 +0100
+++ config/install.pl 2013-11-25 15:17:23.522211642 +0100
@@ -293,8 +293,10 @@
split(/\s+/,$cfg{'IMAGE_TYPES'}) : qw(gif);
my $iconrx = join('|', @icon_types);
+my $destdir=$ENV{"DESTDIR"};
my $dest1 = "$cfg{'SHLIBDIR'}${dd}icons";
-if((-d $dest1 && !-w _) || (-d $cfg{'SHLIBDIR'} && !-w _)) {
+print STDERR "((( $destdir, $dest1 )))\n";
+if((-d "$destdir$dest1" && !-w _) || (-d "$destdir$cfg{'SHLIBDIR'}" && !-w _)) {
print STDERR "Error: Cannot install icons in '$dest1': No write permission.\n";
$dest1 = '';
}
@@ -372,7 +374,10 @@
if($cfg{TEXPATH}) {
print "\nNote: trying to install LaTeX2HTML style files in TeX directory tree\n ($cfg{TEXPATH})\n";
- unless(mkpath($cfg{TEXPATH})) {
+ my $dest = $cfg{TEXPATH};
+ my $destdir=$ENV{"DESTDIR"};
+ $dest= "$destdir$dest";
+ unless(mkpath($dest)) {
#my $testpath = $cfg{TEXPATH}; # to strip (latex2)html
#$testpath =~ s/[$dd$dd][^$dd$dd]*$//;
#if((-d $cfg{TEXPATH} && !-w _) || (-d $testpath && !-w _)) {

View File

@ -0,0 +1,14 @@
Index: config/config.pl
===================================================================
--- config/config.pl.orig
+++ config/config.pl
@@ -1918,7 +1918,7 @@ else {
$newcfg{'SHLIBDIR'} = $newcfg{'PREFIX'};
}
else {
- $newcfg{'SHLIBDIR'} = "$newcfg{'PREFIX'}${dd}share${dd}lib${dd}latex2html";
+ $newcfg{'SHLIBDIR'} = "$newcfg{'PREFIX'}${dd}share${dd}latex2html";
}
}
add_drive_letter($newcfg{'SHLIBDIR'});

3
latex2html-2012.tgz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:36b4b633507dba19a356d4ec5c6c145b242406b2b47cbe44aabf5e7efa2aa16f
size 1155856

View File

@ -1,37 +0,0 @@
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!\{!);

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:00e6b3ab0f0d3e1b519047a1fb08ae035355b80d9deaa766fb652bee7ca62f6d
size 423013

114
latex2html.1 Normal file
View File

@ -0,0 +1,114 @@
.00; # finish .ig
'di \" finish diversion--previous line must be blank
.nr nl 0-1 \" fake up transition to first page again
.nr % 0 \" start at page 1
'; __END__ ##### From here on it's a standard manual page - VERSION #####
.TH LaTeX2HTML 1
.AT 3
.SH NAME
latex2html \- translate LaTeX files to HTML (HyperText Markup Language)
.SH SYNOPSIS
.B
latex2html
[-address author-address]
[-antialias]
[-antialias_text]
[-ascii_mode]
[-auto_navigation]
[-auto_prefix]
[-biblio URL]
[-bottom_navigation]
[-contents URL]
[-contents_in_navigation]
[-custom_titles]
[-debug]
[-dir output-directory]
[-discard]
[-down_title string]
[-down_url URL]
[-external_file filename]
[-external_images]
[-font_size size]
[-h(elp)]
[-html_version (2.0|3.0|3.2)[,(math|i18n|table)]*]
[-images_only]
[-index URL]
[-index_in_navigation]
[-info string]
[-init_file file]
[-iso_language type]
[-ldump]
[-link num]
[-local_icons]
[-long_titles num]
[-next_page_in_navigation]
[-no_antialias]
[-no_antialias_text]
[-no_auto_link]
[-no_footnode]
[-no_fork]
[-no_images]
[-no_math]
[-no_navigation]
[-no_reuse]
[-no_subdir]
[-no_tex_defs]
[-no_white]
[-nolatex]
[-numbered_footnotes]
[-prefix filename-prefix]
[-prev_title string]
[-prev_url URL]
[-previous_page_in_navigation]
[-ps_images]
[-reuse reuse_option]
[-scalable_fonts]
[-short_extn]
[-short_index]
[-show_section_numbers]
[-split + num]
[-split num]
[-t top-page-title]
[-tmp path]
[-toc_depth num]
[-toc_stars]
[-top_navigation]
[-unsegment]
[-up_title string]
[-up_url URL]
[-v]
[-verbosity num]
[-white]
file(s)
.SH DESCRIPTION
.I LaTeX2HTML
is a Perl program that translates LaTeX source files into HTML. For each source
file given as an argument the translator will create a directory containing the
corresponding HTML files.
See the WWW online documentation or the /usr/share/doc/packages/latex2html/manual.ps.gz
file for more detailed information and examples.
.SH PROBLEMS
For information on various problems and remedies see the WWW online documentation
or the documents available in the distribution.
A mailing list for technical discussion about latex2html, bugs and enhancements is available at
latex2html@tug.org
.SH SUSE installation
In /usr/share/doc/packages/latex2html you may find more information about this package.
.SH AUTHOR
Nikos Drakos, Computer Based Learning Unit, University of Leeds
<nikos@cbl.leeds.ac.uk>. Several people have contributed suggestions,
ideas, solutions, support and
encouragement.
The pstogif script uses the pstoppm.ps
postscript program originally written by Phillip Conrad (Perfect Byte, Inc.)
and modified by L. Peter Deutsch (Aladdin Enterprises).

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Mon Nov 25 14:59:53 UTC 2013 - pgajdos@suse.com
- updated to version 2012:
* fix warnings in perl 5.14
* build fixes
- latex2html-2008.diff was split to share-dir.patch, local.pm
(source) and latex2html.1 (source)
- buildroot.diff was renamed to dest-dir.diff and that was extended
to install icons properly
- fix-defined.patch was removed (upstreamed)
- manual.ps.gz was removed
-------------------------------------------------------------------
Tue Sep 10 12:08:06 UTC 2013 - werner@suse.de

View File

@ -21,40 +21,39 @@ BuildRequires: fdupes
BuildRequires: ghostscript-fonts-std
BuildRequires: ghostscript-x11
BuildRequires: netpbm
BuildRequires: texlive-dvips
BuildRequires: texlive-kpathsea
BuildRequires: texlive-latex
BuildRequires: xorg-x11
BuildRequires: xorg-x11-devel
%{expand: %%global _texmfmaindir %(kpsewhich -expand-var='$TEXMFMAIN')}
%define share_dir /usr/share/latex2html
Obsoletes: l2h
Provides: l2h
Url: http://www.latex2html.org/
Provides: l2h99_1
Requires: ghostscript_any
Requires: latex2html-pngicons
Requires: netpbm
Requires: perl
Requires: texlive-dvips
Requires: texlive-latex
Version: 2008
Version: 2012
Release: 0
Summary: LaTeX2HTML Converter
Summary: LaTeX to HTML Converter
License: GPL-2.0+
Group: Productivity/Publishing/TeX/Utilities
BuildArch: noarch
Source: http://www.latex2html.org/~latex2ht/current/%{name}-%{version}.tar.gz
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
Source0: http://mirrors.ctan.org/support/latex2html/latex2html-%{version}.tgz
Source1: latex2html-manual.tar.bz2
Source2: latex2html-README.SUSE
Source3: testfile.tex
Source4: local.pm
Source5: latex2html.1
Patch0: latex2html-%{version}-share-dir.diff
Patch1: latex2html-%{version}-perl-bindir.diff
Patch2: latex2html-%{version}-dest-dir.diff
Patch3: latex2html-%{version}-binmode.diff
Patch4: latex2html-%{version}-gsout.diff
Patch5: latex2html-%{version}-match-multiline.diff
Patch6: latex2html-%{version}-backref-workaround.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -62,12 +61,8 @@ 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.
%package pngicons
Provides: l2h-pngicons
Obsoletes: l2h-pngicons
Summary: Icons in the PNG format for the LaTeX to HTML Converter
Summary: Icons in the PNG format for LateX2HTML
License: GPL-2.0+
Group: Productivity/Publishing/TeX/Utilities
@ -75,7 +70,7 @@ Group: Productivity/Publishing/TeX/Utilities
Icons in the PNG format for the LaTeX to HTML Converter.
%package doc
Summary: LaTeX2HTML Converter
Summary: Documentation for Latex2HTML Converter
License: GPL-2.0+ and LPPL-1.3c
Group: Productivity/Publishing/TeX/Utilities
@ -85,38 +80,33 @@ format. This allows both a written and online version even of older
LaTeX texts.
%prep
%setup
%setup -a 2
%patch
%setup -a 1
%patch0
%patch1
%patch2
%patch3
%patch4
%patch5 -p1
%patch6 -p1
%patch7
cp %{S:1} manual.ps.gz
cp %{S:3} README.SuSE
%patch5
%patch6
cp %{S:2} README.SUSE
cp %{S:4} .
%build
./configure --prefix=%{_prefix}
make
#removing files with zero-length
rm manual/{images.idx,Simages.cb,Pimages.cb,Oimages.cb,Mimages.cb,Himages.cb,Eimages.cb,Pimages.aux,Simages.aux,Oimages.aux,Mimages.aux,Himages.aux}
%install
export RPM_BUILD_ROOT
make install
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
install -m 644 latex2html.man $RPM_BUILD_ROOT/%{_mandir}/man1/latex2html.1
rm -r $RPM_BUILD_ROOT%{share_dir}/{docs,example,dot.latex2html-init,readme.hthtml}
chmod 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/{cweb2html/makemake.pl,cweb2html/cweb2html,makemap,makeseg/makeseg}
make DESTDIR=%{buildroot} install
mkdir -p %{buildroot}/%{_mandir}/man1
install -m 644 %{S:5} %{buildroot}/%{_mandir}/man1
rm -r %{buildroot}%{share_dir}/{docs,example,dot.latex2html-init,readme.hthtml}
chmod 755 %{buildroot}%{_datadir}/%{name}/{cweb2html/makemake.pl,cweb2html/cweb2html,makemap,makeseg/makeseg}
#removing out-dated url.sty [#283760]
rm ${RPM_BUILD_ROOT}%{_texmfmaindir}/tex/latex/html/url.sty
%fdupes -s $RPM_BUILD_ROOT
rm %{buildroot}%{_texmfmaindir}/tex/latex/html/url.sty
%fdupes -s %{buildroot}
%check
LATEX2HTMLDIR=%buildroot/%{share_dir} ./latex2html --test_mode %{S:4}
LATEX2HTMLDIR=%buildroot/%{share_dir} ./latex2html --test_mode %{S:3}
%postun
mkdir -p var/adm/SuSEconfig
@ -128,10 +118,8 @@ touch var/adm/SuSEconfig/run-texhash
%files
%defattr(-, root, root)
%doc README.SuSE
%doc README.SUSE
%doc Changes FAQ README TODO dot.latex2html-init readme.hthtml
#%doc %{_defaultdocdir}/latex2html/manual
#%doc %{_defaultdocdir}/latex2html/manual.ps.gz
/usr/lib/latex2html
%dir %{share_dir}
%{share_dir}/*.pm
@ -159,7 +147,7 @@ touch var/adm/SuSEconfig/run-texhash
%files doc
%defattr(-,root,root)
%doc manual.ps.gz
%doc manual
%doc tests
%doc example

30
local.pm Normal file
View File

@ -0,0 +1,30 @@
#################################################################
# local.pm
#
# Local Configuration for LaTeX2HTML
#
# This file is created automatically. Do not edit!
#
#################################################################
package main;
### start pstoimg configuration ###
$GS_LIB = ' . ; /usr/share/ghostscript/5.50 ; /usr/share/ghostscript/fonts'; # Inserted by configure-pstoimg
$GS_DEVICE = 'ppmraw'; # Inserted by configure-pstoimg
$GS = '/usr/bin/gs'; # Inserted by configure-pstoimg
$PNMCAT = '/usr/X11R6/bin/pnmcat'; # Inserted by configure-pstoimg
$PNMFILE = '/usr/X11R6/bin/pnmfile'; # Inserted by configure-pstoimg
$PNMTOPNG = '/usr/X11R6/bin/pnmtopng'; # Inserted by configure-pstoimg
$PBMMAKE = '/usr/X11R6/bin/pbmmake'; # Inserted by configure-pstoimg
$GSLANDSCAPE = '/usr/share/ghostscript/5.50/landscap.ps'; # Inserted by configure-pstoimg
$PPMQUANT = '/usr/X11R6/bin/ppmquant'; # Inserted by configure-pstoimg
$PNMFLIP = '/usr/X11R6/bin/pnmflip'; # Inserted by configure-pstoimg
$bg_color = '\#bfbfbf'; # Inserted by configure-pstoimg
$white_color = '\#ffffff'; # Inserted by configure-pstoimg
$PNMCROP = '/usr/X11R6/bin/pnmcrop'; # Inserted by configure-pstoimg
### end pstoimg configuration ###
1;