From c57b5c0e74790bf3f86cfcc4771013b056b11060 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Tue, 27 Jun 2006 07:33:52 +0000 Subject: [PATCH] - remove .pdvips patch - man pages are now stored in tar.gz - rebuilt Sun Jun 25 2006 Mamoru Tasaka - fix BuildRequires to be rebuilt with mock (#191762) - fix spec file scripts. - update source files (use tar.gz with the date 20041025 and 2.1b1.6 Japanese patch) --- .cvsignore | 3 ++ latex2html.spec | 94 ++++++++++++++++++++++++++++++------------------- sources | 6 ++-- 3 files changed, 64 insertions(+), 39 deletions(-) diff --git a/.cvsignore b/.cvsignore index f2022bf..3a3de69 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,6 @@ l2h-2002-2-1+jp2.0.patch.gz latex2html-2002-2-1.tar.bz2 latex2html-manpages.tar.bz2 +latex2html-2002-2-1.tar.gz +l2h-2K2-2-1+jp2.1b1.6.patch.gz +latex2html-manpages.tar.gz diff --git a/latex2html.spec b/latex2html.spec index 23bcdbc..fa177eb 100644 --- a/latex2html.spec +++ b/latex2html.spec @@ -4,13 +4,13 @@ Summary: Converts LaTeX documents to HTML Name: latex2html Version: 2002.2.1 -Release: 5.1 +Release: 6 License: Free To Use But Restricted (See LICENSE) Group: Applications/Publishing URL: http://www.latex2html.org/ -Source0: http://saftsack.fs.uni-bayreuth.de/~latex2ht/current/%{name}-%{latex2html_ver}.tar.bz2 +Source0: http://saftsack.fs.uni-bayreuth.de/~latex2ht/current/%{name}-%{latex2html_ver}.tar.gz Source1: cfgcache.pm -Source2: %{name}-manpages.tar.bz2 +Source2: %{name}-manpages.tar.gz Patch0: latex2html-2K.1beta-tabularx.patch Patch1: teTeX-l2h-config.patch Patch3: latex2html-2K.1beta-DB.patch @@ -21,11 +21,10 @@ Patch6: latex2html-2002.2.1-grayimg.patch ### # Japanization patches ### -Patch100: http://takeno.iee.niit.ac.jp/~shige/TeX/latex2html/data/l2h-2002-2-1+jp2.0.patch.gz -Patch101: latex2html-2002.2.1-pdvips.patch +Patch100: http://takeno.iee.niit.ac.jp/~shige/TeX/latex2html/current/data/l2h-2K2-2-1+jp2.1b1.6.patch.gz Requires: tetex-latex, tetex-dvips -BuildRequires: perl >= 5.003, ghostscript >= 4.03, netpbm >= 9.21 +BuildRequires: perl >= 5.003, ghostscript >= 4.03, netpbm >= 9.21, tetex-latex BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch @@ -56,9 +55,6 @@ pushd %{name}-%{latex2html_ver} # don't require the font directory to be ended with PATH/fonts %patch5 -p1 -b .gsfont -# don't generate gray images as output form latex2html -%patch6 -p1 -b .grayimg - # remove all platforms we don't need for i in Dos Mac OS2 Win32; do rm -f L2hos/${i}.pm @@ -70,14 +66,19 @@ cp -a %{name}-%{latex2html_ver} %{name}-%{latex2html_ver}JA pushd %{name}-%{latex2html_ver}JA # JA patches for latex2html. %patch100 -p1 -b .jp2 -%patch101 -p1 -b .pdvips popd %endif +pushd %{name}-%{latex2html_ver} +# 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}-%{latex2html_ver} cp %{SOURCE1} cfgcache.pm -tar fxj %{SOURCE2} +tar fxz %{SOURCE2} ./configure --program-prefix=%{?_program_prefix} \ --prefix=%{_prefix} \ @@ -87,12 +88,13 @@ tar fxj %{SOURCE2} --sysconfdir=%{_sysconfdir} \ --datadir=%{_datadir} \ --includedir=%{_includedir} \ - --libdir=%{_libdir} \ + --libdir=%{_datadir}/latex2html \ --libexecdir=%{_libexecdir} \ --localstatedir=%{_localstatedir} \ --sharedstatedir=%{_sharedstatedir} \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ + --shlibdir=%{_datadir}/latex2html \ --with-texpath=%{_datadir}/texmf/tex/latex/html perl -pi -e"s,/usr/(share/)?lib,%{_datadir}," cfgcache.pm @@ -103,6 +105,7 @@ popd pushd %{name}-%{latex2html_ver}JA sed s/latex2html/jlatex2html/g < %{SOURCE1} > cfgcache.pm perl -pi -e"s,/usr/bin/dvips,/usr/bin/pdvips," cfgcache.pm +perl -pi -e"s,/usr/bin/latex,/usr/bin/platex," cfgcache.pm ./configure --program-prefix=%{?_program_prefix} \ --prefix=%{_prefix} \ @@ -112,18 +115,22 @@ perl -pi -e"s,/usr/bin/dvips,/usr/bin/pdvips," cfgcache.pm --sysconfdir=%{_sysconfdir} \ --datadir=%{_datadir} \ --includedir=%{_includedir} \ - --libdir=%{_libdir} \ + --libdir=%{_datadir}/jlatex2html \ --libexecdir=%{_libexecdir} \ --localstatedir=%{_localstatedir} \ --sharedstatedir=%{_sharedstatedir} \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ + --shlibdir=%{_datadir}/jlatex2html \ --with-texpath=%{_datadir}/texmf/tex/latex/html perl -pi -e"s,/usr/(share/)?lib,%{_datadir},; s,%{_datadir}/latex2html,%{_datadir}/jlatex2html," cfgcache.pm make perl -pi -e"s,${RPM_BUILD_ROOT},," l2hconf.pm +perl -pi -e"s,\\\${dd}pstoimg,\\\${dd}jpstoimg, ; + s,\\\${dd}texexpand,\\\${dd}jtexexpand," l2hconf.pm + for i in latex2html pstoimg texexpand ; do mv ${i} j${i} done @@ -134,14 +141,12 @@ popd rm -rf $RPM_BUILD_ROOT pushd %{name}-%{latex2html_ver} -perl -pi -e"s,%{_bindir},${RPM_BUILD_ROOT}%{_bindir},; - s,%{_datadir}/latex2html,${RPM_BUILD_ROOT}%{_datadir}/latex2html,; - s,%{_datadir}/texmf,${RPM_BUILD_ROOT}%{_datadir}/texmf," cfgcache.pm -perl -pi -e"s,%{_builddir}/latex2html-%{latex2html_ver}\${dd}tetexexpand,%{_bindir}/texexpand,; - s,%{_builddir}/latex2html-%{latex2html_ver}\${dd}pstoimg,%{_bindir}/pstoimg,; - s,%{_builddir}/latex2html-%{latex2html_ver}\${dd}icons,\${LATEX2HTMLDIR}/icons,; - s,%{_builddir}/latex2html-%{latex2html_ver}\${dd}styles\${dd}rgb.txt,\${LATEX2HTMLDIR}/styles/rgb.txt,; - s,%{_builddir}/latex2html-%{latex2html_ver}\${dd}styles\${dd}crayola.txt,\${LATEX2HTMLDIR}/styles/crayola.txt," latex2html +perl -pi -e"s,%{_prefix},${RPM_BUILD_ROOT}%{_prefix}," cfgcache.pm +perl -pi -e"s,/.*\\\${dd}texexpand,%{_bindir}/texexpand,; + s,/.*\\\${dd}pstoimg,%{_bindir}/pstoimg,; + s,/.*\\\${dd}*icons,\\\${LATEX2HTMLDIR}/icons,; + s,/.*\\\${dd}rgb.txt,\\\${LATEX2HTMLDIR}/styles/rgb.txt,; + s,/.*\\\${dd}styles\\\${dd}crayola.txt,\\\${LATEX2HTMLDIR}/styles/crayola.txt," latex2html perl -pi -e"s,$RPM_BUILD_ROOT,," l2hconf.pm make install @@ -160,25 +165,33 @@ popd %if %{enable_japanese} pushd %{name}-%{latex2html_ver}JA -perl -pi -e"s,%{_bindir},${RPM_BUILD_ROOT}%{_bindir},; - s,%{_datadir}/jlatex2html,${RPM_BUILD_ROOT}%{_datadir}/jlatex2html,; - s,%{_datadir}/texmf,${RPM_BUILD_ROOT}%{_datadir}/texmf," cfgcache.pm +perl -pi -e"s,%{_prefix},${RPM_BUILD_ROOT}%{_prefix}," cfgcache.pm perl -pi -e"s,latex2html pstoimg texexpand,jlatex2html jpstoimg jtexexpand," config/install.pl -perl -pi -e"s,%{_builddir}/latex2html-%{latex2html_ver}JA\${dd}tetexexpand,%{_bindir}/texexpand,; - s,%{_builddir}/latex2html-%{latex2html_ver}JA\${dd}pstoimg,%{_bindir}/pstoimg,; - s,%{_builddir}/latex2html-%{latex2html_ver}JA\${dd}icons,\${LATEX2HTMLDIR}/icons,; - s,%{_builddir}/latex2html-%{latex2html_ver}JA\${dd}styles\${dd}rgb.txt,\${LATEX2HTMLDIR}/styles/rgb.txt,; - s,%{_builddir}/latex2html-%{latex2html_ver}JA\${dd}styles\${dd}crayola.txt,\${LATEX2HTMLDIR}/styles/crayola.txt," latex2html +perl -pi -e"s,/.*\\\${dd}texexpand,%{_bindir}/jtexexpand,; + s,/.*\\\${dd}pstoimg,%{_bindir}/jpstoimg,; + s,/.*\\\${dd}icons,\\\${LATEX2HTMLDIR}/icons,; + s,/.*\\\${dd}styles\\\${dd}rgb.txt,\\\${LATEX2HTMLDIR}/styles/rgb.txt,; + s,/.*\\\${dd}styles\\\${dd}crayola.txt,\\\${LATEX2HTMLDIR}/styles/crayola.txt," jlatex2html perl -pi -e"s,$RPM_BUILD_ROOT,," l2hconf.pm make install rm -f %{buildroot}%{_datadir}/jlatex2html/versions/table.pl.orig +perl -pi -e"s,$RPM_BUILD_ROOT,," %{buildroot}%{_datadir}/jlatex2html/cfgcache.pm +perl -pi -e"s,$RPM_BUILD_ROOT,," %{buildroot}%{_bindir}/jpstoimg +perl -pi -e"s,$RPM_BUILD_ROOT,," %{buildroot}%{_bindir}/jtexexpand perl -pi -e"s,$RPM_BUILD_ROOT,," cfgcache.pm perl -pi -e"s,$cfg{'GS_LIB'} = q'';,$cfg{'GS_LIB'} = q'%{_datadir}/ghostscript/`ghostscript --version`';," cfgcache.pm install -m0644 *.pm %{buildroot}%{_datadir}/jlatex2html popd %endif +for f in cweb2html/cweb2html makeseg/makeseg makemap ; do + perl -pi -e "s,/usr/local/bin/perl,/usr/bin/perl," $RPM_BUILD_ROOT%{_datadir}/latex2html/$f +%if %{enable_japanese} + perl -pi -e "s,/usr/local/bin/perl,/usr/bin/perl," $RPM_BUILD_ROOT%{_datadir}/jlatex2html/$f +%endif +done + %clean rm -rf $RPM_BUILD_ROOT @@ -192,19 +205,18 @@ exit 0 %files %defattr(-,root,root,-) -%doc - /usr/bin/latex2html - /usr/bin/pstoimg - /usr/bin/texexpand +%{_bindir}/latex2html +%{_bindir}/pstoimg +%{_bindir}/texexpand %dir %{_datadir}/latex2html %{_datadir}/latex2html/* %dir %{_datadir}/texmf/tex/latex/html %{_datadir}/texmf/tex/latex/html/* %if %{enable_japanese} - /usr/bin/jlatex2html - /usr/bin/jpstoimg - /usr/bin/jtexexpand +%{_bindir}/jlatex2html +%{_bindir}/jpstoimg +%{_bindir}/jtexexpand %dir %{_datadir}/jlatex2html %{_datadir}/jlatex2html/* %endif @@ -214,6 +226,16 @@ exit 0 %{_mandir}/man1/pstoimg.* %changelog +* Tue Jun 27 2006 Jindrich Novy 2002.2.1-6 +- remove .pdvips patch +- man pages are now stored in tar.gz +- rebuilt + +* Sun Jun 25 2006 Mamoru Tasaka +- fix BuildRequires to be rebuilt with mock (#191762) +- fix spec file scripts. +- update source files (use tar.gz with the date 20041025 and 2.1b1.6 Japanese patch) + * Fri Dec 09 2005 Jesse Keating - rebuilt diff --git a/sources b/sources index ad85ab9..5354590 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -0b44186e870fa5790205231cbab0f789 l2h-2002-2-1+jp2.0.patch.gz -e8374264303f56ef66c97ec2392eccbe latex2html-2002-2-1.tar.bz2 -e931367bddb503cbbbc60376354736e3 latex2html-manpages.tar.bz2 +a79cda0648c8721ab6df5020cd11e220 latex2html-2002-2-1.tar.gz +a4f534ef3fc0e0e09a4ddb664beae487 l2h-2K2-2-1+jp2.1b1.6.patch.gz +a27170c02c0f2bc3a524058711e339a4 latex2html-manpages.tar.gz