packages: texlive/texlive.spec - fixed bootstrap bcond - moved common dirs ...

[megabajt]

Author: megabajt                     Date: Tue Feb  2 14:24:17 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed bootstrap bcond
- moved common dirs to texlive-texmf

---- Files affected:
packages/texlive:
   texlive.spec (1.320 -> 1.321) 

---- Diffs:

================================================================
Index: packages/texlive/texlive.spec
diff -u packages/texlive/texlive.spec:1.320 packages/texlive/texlive.spec:1.321
--- packages/texlive/texlive.spec:1.320	Tue Feb  2 13:28:49 2010
+++ packages/texlive/texlive.spec	Tue Feb  2 15:24:11 2010
@@ -100,7 +100,6 @@
 BuildRequires:	freetype-devel
 BuildRequires:	freetype1-devel
 BuildRequires:	gd-devel >= 2.0.33
-BuildRequires:	kpathsea-devel
 BuildRequires:	libpng-devel >= 1.2.8
 BuildRequires:	libtool
 # should this be somewhere in clisp?
@@ -113,12 +112,7 @@
 BuildRequires:	sed >= 4.0
 BuildRequires:	t1lib-devel >= 5.0.2
 BuildRequires:	texinfo
-%if %{with bootstrap}
-BuildRequires:	tetex-format-latex
-BuildRequires:	tetex-format-pdflatex
-BuildRequires:	tetex-latex-cyrillic
-BuildRequires:	tetex-tex-babel
-%else
+%if %{without bootstrap}
 BuildRequires:	%{name}-context
 BuildRequires:	%{name}-csplain
 BuildRequires:	%{name}-fonts-cmsuper
@@ -142,7 +136,6 @@
 BuildRequires:	%{name}-xmltex
 # fill with future texlive BR. guesses ones for now
 %endif
-BuildRequires:	/usr/bin/latex
 BuildRequires:	unzip
 BuildRequires:	xorg-lib-libICE-devel
 BuildRequires:	xorg-lib-libXaw-devel
@@ -5981,6 +5974,7 @@
 rm -f $RPM_BUILD_ROOT%{texmf}/doc/index.php
 rm -f $RPM_BUILD_ROOT%{texmf}/doc/mkhtml*
 rm -f $RPM_BUILD_ROOT%{texmf}/doc/programs/texinfo.*
+rm -rf $RPM_BUILD_ROOT%{texmf}/doc/tetex
 rm -f $RPM_BUILD_ROOT%{texmf}/fonts/pk/ljfour/lh/lh-lcy/*.600pk
 rm -f $RPM_BUILD_ROOT%{texmf}/generic/config/pdftex-dvi.tex
 rm -f $RPM_BUILD_ROOT%{texmf}/release-tetex-{src,texmf}.txt
@@ -6027,13 +6021,14 @@
 	xelatex; do
 # pdfxmltex \
 # xmltex; do
-#  %if %{with bootstrap}
-#  	install -d $RPM_BUILD_ROOT%{fmtdir}/${format}
-#  	touch $RPM_BUILD_ROOT%{fmtdir}/${format}/${format}.fmt
-#  	touch $RPM_BUILD_ROOT%{fmtdir}/pdftex/${format}.fmt
-#  %else
+
+%if %{with bootstrap}
+  	install -d $RPM_BUILD_ROOT%{fmtdir}/${format}
+  	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}
-#  %endif
+%endif
 done
 
 %if %{with bootstrap}
@@ -7600,30 +7595,6 @@
 %attr(1777,root,root) %dir %{_localstatedir}
 %attr(1777,root,root) %dir %{_localstatedir}/fonts
 %attr(1777,root,root) %dir %{_localstatedir}/fonts/map
-%attr(1777,root,root) %dir %{fmtdir}
-
-%dir %{fmtdir}/tex
-%dir %{texmfdist}
-%dir %{texmfdist}/doc
-%dir %{texmfdist}/doc/generic
-%dir %{texmfdist}/scripts
-%dir %{texmfdist}/source
-%dir %{texmfdist}/source/generic
-%dir %{texmfdist}/tex
-%dir %{texmfdist}/tex/generic
-%dir %{texmfdist}/tex/plain
-%dir %{texmf}
-%dir %{texmf}/doc
-%dir %{texmf}/doc/tetex
-%dir %{texmf}/dvips
-%dir %{texmf}/fonts/map
-%dir %{texmf}/scripts
-%dir %{texmf}/tex
-%dir %{texmf}/web2c
-
-# Docs
-%doc %{texmf}/doc/tetex/TETEXDOC.*
-%doc %{texmf}/doc/tetex/teTeX-FAQ
 
 %{_mandir}/man1/afm2tfm.1*
 %{_mandir}/man1/allcm.1*
@@ -7681,6 +7652,7 @@
 %{_mandir}/man5/updmap.cfg.5*
 %{fmtdir}/pdftex/pdfetex.fmt
 # %{fmtdir}/pdfetex
+%dir %{fmtdir}/tex
 %{fmtdir}/tex/tex.fmt
 # %{fmtdir}/pdftex/tex.fmt
 
@@ -13929,6 +13901,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.321  2010/02/02 14:24:11  megabajt
+- fixed bootstrap bcond
+- moved common dirs to texlive-texmf
+
 Revision 1.320  2010/02/02 12:28:49  arekm
 - revert fmtutil checking
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/texlive/texlive.spec?r1=1.320&r2=1.321&f=u