- tell what is likely to be missing on failure

[packages/texlive.git] / texlive.spec

diff --git a/texlive.spec b/texlive.spec
index 19728e9af257909900821d5dddbb1b7013945d96..09e694cadb18c823831fc3ea52b6fc1a8beb9c5d 100644 (file)
--- a/texlive.spec
+++ b/texlive.spec
@@ -25,7 +25,7 @@
 #
 %define                year    2009
 %define                monthday        1011
-%define                texmfversion
+%define                texmfversion 20091107
 Summary:       TeX typesetting system and MetaFont font formatter
 Summary(de.UTF-8):     TeX-Satzherstellungssystem und MetaFont-Formatierung
 Summary(es.UTF-8):     Sistema de typesetting TeX y formateador de fuentes MetaFont
@@ -36,7 +36,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:       %{year}%{monthday}
-Release:       3
+Release:       5
 Epoch:         1
 License:       distributable
 Group:         Applications/Publishing/TeX
@@ -1521,7 +1521,7 @@ Group:            Applications/Publishing/TeX
 Requires(post,postun): %{_bindir}/texhash
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      %{name}-fonts-pl >= %{texmfversion}
-Requires:      %{name}-plain = %{epoch}:%{version}-%{release}
+Requires:      %{name}-plain >= %{texmfversion}
 Obsoletes:     tetex-mex
 
 %description mex
@@ -1535,7 +1535,7 @@ Summary:  MeX Plain Format
 Summary(pl.UTF-8):     Format MeX Plain
 Group:         Applications/Publishing/TeX
 Requires(post,postun): %{_bindir}/texhash
-Requires:      %{name}-mex = %{epoch}:%{version}-%{release}
+Requires:      %{name}-mex >= %{texmfversion}
 Obsoletes:     tetex-format-mex
 
 %description format-mex
@@ -1581,8 +1581,8 @@ Summary(pl.UTF-8):        Podstawowe pliki makr AMS dla formatu Plain TeX
 Group:         Applications/Publishing/TeX
 Requires(post,postun): %{_bindir}/texhash
 Requires:      %{name}-fonts-ams >= %{texmfversion}
-Requires:      %{name}-format-amstex
-Requires:      %{name}-plain
+Requires:      %{name}-format-amstex >= %{texmfversion}
+Requires:      %{name}-plain >= %{texmfversion}
 Provides:      tetex-ams
 Obsoletes:     tetex-ams
 Obsoletes:     tetex-amstex
@@ -1663,8 +1663,8 @@ Summary:  CSLaTeX format basic files
 Summary(pl.UTF-8):     Podstawowe pliki dla formatu CSLaTeX
 Group:         Applications/Publishing/TeX
 Requires(post,postun): %{_bindir}/texhash
-Requires:      %{name}-fonts-cs
-Requires:      %{name}-plain
+Requires:      %{name}-fonts-cs >= %{texmfversion}
+Requires:      %{name}-plain >= %{texmfversion}
 Provides:      tetex-cslatex
 Obsoletes:     tetex-cslatex
 
@@ -1741,6 +1741,7 @@ Summary(pl.UTF-8):        Podstawowe pliki pakietu makr ConTeXt
 Group:         Applications/Publishing/TeX
 Requires(post,postun): %{_bindir}/texhash
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      %{name}-context-data
 Provides:      tetex-context
 Obsoletes:     tetex-context
 
@@ -6040,7 +6041,9 @@ for format in \
 #      touch $RPM_BUILD_ROOT%{fmtdir}/${format}/${format}.fmt
 #      touch $RPM_BUILD_ROOT%{fmtdir}/pdftex/${format}.fmt
 #  %else
-       fmtutil --fmtdir $RPM_BUILD_ROOT%{fmtdir} --byfmt=${format}
+       out=$(fmtutil --fmtdir $RPM_BUILD_ROOT%{fmtdir} --byfmt=${format})
+       echo $out
+       [ -z $out ] && echo "fmtutil for format ${format} failed. Likely ${format}.ini file missing..." && exit 1
 #  %endif
 done
 %if %{with bootstrap}