packages: latex2html/latex2html.spec, latex2html/latex2html-destdir.patch (...

qboosh qboosh at pld-linux.org
Thu Apr 5 20:02:42 CEST 2012 

Author: qboosh                       Date: Thu Apr  5 18:02:42 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2008
- added destdir patch to fix texmf data installation

---- Files affected:
packages/latex2html:
   latex2html.spec (1.45 -> 1.46) , latex2html-destdir.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/latex2html/latex2html.spec
diff -u packages/latex2html/latex2html.spec:1.45 packages/latex2html/latex2html.spec:1.46
--- packages/latex2html/latex2html.spec:1.45	Sat Jan 29 01:06:52 2011
+++ packages/latex2html/latex2html.spec	Thu Apr  5 20:02:37 2012
@@ -10,18 +10,18 @@
 Summary:	LaTeX to HTML translator
 Summary(pl.UTF-8):	Konwerter z LaTeXa do HTML
 Name:		latex2html
-Version:	2002
-%define	subv	2-1
-Release:	8
-License:	GPL
+Version:	2008
+Release:	1
+License:	GPL v2
 Group:		Applications/Publishing/TeX
-Source0:	http://www.ctan.org/tex-archive/support/latex2html/%{name}-%{version}-%{subv}.tar.gz
-# Source0-md5:	37488919ac4fd3475d389ddfdb0aea02
+Source0:	http://www.latex2html.org/~latex2ht/current/%{name}-%{version}.tar.gz
+# Source0-md5:	275ab6cfa8ca9328446b7f40d8dc302e
 Patch0:		%{name}-perl.patch
 Patch1:		%{name}-tmp.patch
 Patch2:		%{name}-gslib.patch
 Patch3:		%{name}-extract-major-version.patch
 Patch4:		%{name}-convert-length.patch
+Patch5:		%{name}-destdir.patch
 URL:		http://www.latex2html.org/
 BuildRequires:	ghostscript
 BuildRequires:	giftrans
@@ -30,10 +30,10 @@
 BuildRequires:	%{__perl}
 BuildRequires:	rpm-perlprov
 %if %{with tex}
-BuildRequires:	tetex-dvips
-BuildRequires:	tetex-fonts-ams
-BuildRequires:	tetex-format-latex
-BuildRequires:	tetex-makeindex
+BuildRequires:	texlive-dvips
+BuildRequires:	texlive-fonts-ams
+BuildRequires:	texlive-latex
+BuildRequires:	texlive-makeindex
 %endif
 Requires:	apache-icons
 Requires:	ghostscript >= 4.03
@@ -48,6 +48,8 @@
 %define		_libdir		%{_datadir}/%{name}
 %define		_shlibdir	%{_datadir}/%{name}
 
+%define		texmfdir	/usr/share/texmf
+
 %description
 Elaborate Perl program to convert latex documents to html, using LaTeX
 to process images and equations.
@@ -57,12 +59,13 @@
 Generuje strony html oraz odpowiednie obrazki.
 
 %prep
-%setup -q -n %{name}-%{version}-%{subv}
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 GS_LIB=.:/usr/share/ghostscript/lib:/usr/share/fonts/Type1; export GS_LIB
@@ -79,7 +82,7 @@
 	--with-perl=%{__perl} \
 	--with-gs=/usr/bin/gs \
 	--with-rgb=%{_datadir}/X11/rgb.txt \
-	--with-texpath=/usr/share/texmf/tex/latex/%{name} \
+	--with-texpath=%{texmfdir}/tex/latex/%{name} \
 	--with-iconpath=/icons/l2h
 
 %{__make}
@@ -99,7 +102,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/%{_datadir}/apache-icons
+install -d $RPM_BUILD_ROOT%{_datadir}/apache-icons
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -107,7 +110,7 @@
 ln -sf	%{_shlibdir}/cweb2html/cweb2html $RPM_BUILD_ROOT%{_bindir}/cweb2html
 ln -sf	%{_shlibdir}/icons $RPM_BUILD_ROOT%{_datadir}/apache-icons/l2h
 
-rm -rf	$RPM_BUILD_ROOT%{_shlibdir}/{docs,example,foilhtml/foilhtml.log}
+%{__rm} -r $RPM_BUILD_ROOT%{_shlibdir}/{docs,example}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -123,7 +126,10 @@
 %files
 %defattr(644,root,root,755)
 %doc BUGS FAQ LICENSE README TODO %{?with_tex:docs/manual.ps}
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/cweb2html
+%attr(755,root,root) %{_bindir}/latex2html
+%attr(755,root,root) %{_bindir}/pstoimg
+%attr(755,root,root) %{_bindir}/texexpand
 %dir %{_shlibdir}
 %{_shlibdir}/[!c]*
 %{_shlibdir}/c[!w]*
@@ -131,6 +137,7 @@
 %{_shlibdir}/cweb2html/[!c]*
 %{_shlibdir}/cweb2html/cweb.*
 %attr(755,root,root) %{_shlibdir}/cweb2html/cweb2html
+%{texmfdir}/tex/latex/%{name}
 %{_datadir}/apache-icons/l2h
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -139,6 +146,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2012/04/05 18:02:37  qboosh
+- updated to 2008
+- added destdir patch to fix texmf data installation
+
 Revision 1.45  2011/01/29 00:06:52  sparky
 - dropped pre-cvs changelog
 

================================================================
Index: packages/latex2html/latex2html-destdir.patch
diff -u /dev/null packages/latex2html/latex2html-destdir.patch:1.1
--- /dev/null	Thu Apr  5 20:02:43 2012
+++ packages/latex2html/latex2html-destdir.patch	Thu Apr  5 20:02:37 2012
@@ -0,0 +1,38 @@
+--- latex2html-2008/config/install.pl.orig	2002-11-29 12:49:01.000000000 +0100
++++ latex2html-2008/config/install.pl	2012-04-05 19:04:13.629561822 +0200
+@@ -372,14 +372,16 @@
+ 
+ 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};
++  $dest = $ENV{'DESTDIR'}.$dest if($ENV{'DESTDIR'});
++
++  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 _)) {
+     print STDERR "\nError: Cannot install LaTeX2HTML style files in $cfg{TEXPATH}\n";
+   } else {
+     my $dir = 'texinputs';
+-    my $dest = $cfg{TEXPATH};
+     unless(opendir(DIR,$dir)) {
+       print STDERR qq{Error: Could not read directory "$dir": $!\n};
+     } else {
+#@@ -388,13 +390,13 @@
+#       while(defined($file = readdir(DIR))) {
+#         my $full = "$dir/$file";
+#         next if($file =~ /^\.\.?$/ || !-f $full || !-s _);
+#-        unless(&install_file($full,$cfg{TEXPATH},$FILECHMOD,0)) {
+#+        unless(&install_file($full,$dest,$FILECHMOD,0)) {
+#           $ok = 0;
+#           last;
+@@ -394,7 +396,7 @@
+         }
+       }
+       closedir(DIR);
+-      if($ok && $cfg{MKTEXLSR}) {
++      if($ok && $cfg{MKTEXLSR} && !$ENV{'DESTDIR'}) {
+         print "Info: Running $cfg{MKTEXLSR} to rebuild ls-R database...\n";
+         system($cfg{MKTEXLSR});
+       }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/latex2html/latex2html.spec?r1=1.45&r2=1.46

More information about the pld-cvs-commit mailing list