- some fixes

[packages/texlive.git] / texlive.spec

diff --git a/texlive.spec b/texlive.spec
index 2cb65897debcc8d28e9cd0e10ac26cfeaf6bb4d4..f28449a5155429014cce5c78e1e8ce5f610f2073 100644 (file)
--- a/texlive.spec
+++ b/texlive.spec
@@ -45,7 +45,7 @@ Summary(pt_BR.UTF-8): Sistema de typesetting TeX e formatador de fontes MetaFont
 Summary(tr.UTF-8):     TeX dizgi sistemi ve MetaFont yazıtipi biçimlendiricisi
 Name:          texlive
 Version:       20080816
-Release:       4.1
+Release:       4.2
 Epoch:         1
 License:       distributable
 Group:         Applications/Publishing/TeX
@@ -5504,6 +5504,8 @@ Egy szűrő, amely .tex fájlokból szűri ki a TeX parancsokat.
 Summary:       Various DVI utils
 Summary(hu.UTF-8):     Vegyes DVI eszközök
 Group:         Applications/Publishing/TeX
+Provides:      dvi2tty
+Conflicts:     dvi2tty
 
 %description dviutils
 This package contains various DVI utils.
@@ -5514,6 +5516,7 @@ Ez a csomag mindenféle DVI eszközt tartalmaz.
 %package epsutils
 Summary:       Various EPS utils
 Group:         Applications/Publishing/TeX
+Conflicts:     psutils
 
 %description epsutils
 Various EPS (Encapsulated PostScript) utils.
@@ -5857,10 +5860,32 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/xindy
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 
 # Create format files
-# for format in latex pdftex pdfetex pdflatex; do
-#      fmtutil --byfmt=${format} --fmtdir=$RPM_BUILD_ROOT%{fmtdir}
-# done
-fmtutil --all --fmtdir=$RPM_BUILD_ROOT%{fmtdir}
+for format in \
+       aleph \
+       csplain \
+       etex \
+       lambda \
+       lamed \
+       latex \
+       mllatex \
+       mptopdf \
+       omega \
+       pdfcsplain \
+       pdfetex \
+       pdflatex \
+       pdftex \
+       pdfxmltex \
+       physe \
+       phyzzx \
+       tex \
+       texsis \
+       xetex \
+       xelatex \
+       xmltex; do
+       fmtutil --fmtdir $RPM_BUILD_ROOT%{fmtdir} --byfmt=${format} 
+done
+# We don't need the log files
+rm -f $(find $RPM_BUILD_ROOT%{fmtdir} -name "*.log")
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -7580,6 +7605,10 @@ fi
 %{_mandir}/man5/fmtutil.cnf.5*
 %{_mandir}/man5/updmap.cfg.5*
 
+%{fmtdir}/pdftex/pdfetex.fmt
+%dir %{fmtdir}/tex
+%{fmtdir}/tex/tex.fmt
+
 %files other-utils
 %defattr(644,root,root,755)
 %dir %{texmfdist}/scripts/mkjobtexmf
@@ -7692,6 +7721,7 @@ fi
 %{texmfdist}/source/generic/mkjobtexmf
 %{texmf}/hbf2gf
 %{texmf}/fmtutil/format.texsis.cnf
+%{fmtdir}/pdftex/texsis.fmt
 
 %files other-utils-doc
 %defattr(644,root,root,755)
@@ -7731,6 +7761,7 @@ fi
 %dir %{texmfdist}/fonts/map/dvips
 %dir %{texmfdist}/fonts/map/dvips/vntex
 %dir %{texmfdist}/fonts/map/fontname
+%dir %{texmfdist}/fonts/map/public
 %dir %{texmfdist}/fonts/map/vtex
 %dir %{texmfdist}/fonts/ofm
 %dir %{texmfdist}/fonts/ofm/public
@@ -8112,7 +8143,7 @@ fi
 
 %files tex-kastrup
 %defattr(644,root,root,755)
-%doc %{texmfdist}/doc/generic/kastrup/binhex.pdf
+%doc %{texmfdist}/doc/generic/kastrup
 %{texmfdist}/source/generic/kastrup
 %{texmfdist}/tex/generic/kastrup
 
@@ -8131,6 +8162,7 @@ fi
 %defattr(644,root,root,755)
 %{texmfdist}/tex/physe
 %{texmf}/fmtutil/format.physe.cnf
+%{fmtdir}/pdftex/physe.fmt
 
 %files tex-velthuis
 %defattr(644,root,root,755)
@@ -8209,6 +8241,7 @@ fi
 %attr(755,root,root) %{_bindir}/mptopdf
 %{_mandir}/man1/mptopdf.1*
 %{texmfdist}/tex/mptopdf
+%{fmtdir}/pdftex/mptopdf.fmt
 
 %files texdoctk
 %defattr(644,root,root,755)
@@ -8449,7 +8482,7 @@ fi
 %attr(755,root,root) %{_bindir}/pdfcrop
 %attr(755,root,root) %{_bindir}/pdftex
 %attr(755,root,root) %{texmf}/scripts/epstopdf/epstopdf*
-%attr(1777,root,root) %dir %{fmtdir}/pdftex
+%dir %{fmtdir}/pdftex
 %{_mandir}/man1/epstopdf.1*
 %{_mandir}/man1/pdftex.1*
 %{texmfdist}/fonts/enc/pdftex
@@ -8457,6 +8490,7 @@ fi
 %{texmfdist}/scripts/pdfcrop
 %{texmf}/fmtutil/format.pdftex.cnf
 %{texmf}/fonts/map/pdftex/updmap
+%{fmtdir}/pdftex/pdftex.fmt
 
 %files phyzzx
 %defattr(644,root,root,755)
@@ -8467,6 +8501,7 @@ fi
 %{texmfdist}/tex/phyzzx/base
 %{texmfdist}/tex/phyzzx/config
 %{texmf}/fmtutil/format.phyzzx.cnf
+%{fmtdir}/pdftex/phyzzx.fmt
 
 %files omega
 %defattr(644,root,root,755)
@@ -8513,6 +8548,8 @@ fi
 %{_mandir}/man1/outocp.1*
 %{_mandir}/man1/ovf2ovp.1*
 %{_mandir}/man1/ovp2ovf.1*
+%{fmtdir}/aleph
+%{fmtdir}/omega
 
 %files plain
 %defattr(644,root,root,755)
@@ -8550,8 +8587,6 @@ fi
 
 %files amstex
 %defattr(644,root,root,755)
-%dir %{texmfdist}/tex/amstex
-%{texmfdist}/tex/amstex/base
 %{texmfdist}/tex/amstex/config
 %{texmfdist}/tex/plain/amsfonts
 
@@ -8581,10 +8616,12 @@ fi
 
 %files format-csplain
 %defattr(644,root,root,755)
+%{fmtdir}/pdftex/csplain.fmt
 
 %files format-pdfcsplain
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/pdfcsplain
+%{fmtdir}/pdftex/pdfcsplain.fmt
 
 %files cslatex
 %defattr(644,root,root,755)
@@ -8616,6 +8653,7 @@ fi
 %{_mandir}/man1/eplain.1*
 %{_mandir}/man1/etex.1*
 %{texmf}/fmtutil/format.eplain.cnf
+%{fmtdir}/pdftex/etex.fmt
 
 %files context
 %defattr(644,root,root,755)
@@ -9237,6 +9275,9 @@ fi
 %{texmfdist}/tex/plain/etex
 %{texmf}/tex/latex/config
 %{texmf}/tex/latex/dvipdfm
+%{fmtdir}/pdftex/latex.fmt
+%{fmtdir}/pdftex/mllatex.fmt
+%{fmtdir}/pdftex/pdflatex.fmt
 
 %files latex-12many
 %defattr(644,root,root,755)
@@ -13728,6 +13769,7 @@ fi
 %dir %{texmfdist}/scripts/dviasm
 %dir %{texmf}/fonts/cmap
 %doc %{texmf}/fonts/cmap/README
+%attr(755,root,root) %{_bindir}/disdvi
 %attr(755,root,root) %{_bindir}/dt2dv
 %attr(755,root,root) %{_bindir}/dv2dt
 %attr(755,root,root) %{_bindir}/dvi2tty
@@ -13800,7 +13842,6 @@ fi
 %files uncategorized-utils
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/devnag
-%attr(755,root,root) %{_bindir}/disdvi
 
 %files tex4ht
 %defattr(644,root,root,755)
@@ -13835,6 +13876,7 @@ fi
 %attr(755,root,root) %{_bindir}/xdvipdfmx
 %attr(755,root,root) %{_bindir}/xelatex
 %attr(755,root,root) %{_bindir}/xetex
+%dir %{fmtdir}/xetex
 %doc %{texmfdist}/doc/generic/ifxetex
 %doc %{texmfdist}/doc/generic/xetex-pstricks
 %doc %{texmfdist}/doc/xelatex
@@ -13847,6 +13889,8 @@ fi
 %{texmfdist}/tex/xelatex
 %{texmfdist}/tex/xetex
 %{texmf}/fmtutil/format.xetex.cnf
+%{fmtdir}/xetex/xetex.fmt
+%{fmtdir}/xetex/xelatex.fmt
 
 %files xmltex
 %defattr(644,root,root,755)
@@ -13856,3 +13900,5 @@ fi
 %{texmfdist}/source/xmltex
 %{texmfdist}/tex/xmltex
 %{texmf}/fmtutil/format.xmltex.cnf
+%{fmtdir}/pdftex/pdfxmltex.fmt
+%{fmtdir}/pdftex/xmltex.fmt