Author: uzsolt Date: Fri Dec 26 10:28:44 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- don't mix texmf and texmf-dist
---- Files affected:
SPECS:
texlive.spec (1.65 -> 1.66)
---- Diffs:
================================================================
Index: SPECS/texlive.spec
diff -u SPECS/texlive.spec:1.65 SPECS/texlive.spec:1.66
--- SPECS/texlive.spec:1.65 Fri Dec 26 00:02:45 2008
+++ SPECS/texlive.spec Fri Dec 26 11:28:38 2008
@@ -3371,8 +3371,8 @@
%{__mv} $RPM_BUILD_ROOT%{_datadir}/texlive-20080822-texmf/texmf
$RPM_BUILD_ROOT%{texmf}
%{__mv} $RPM_BUILD_ROOT%{_datadir}/texlive-20080822-texmf/texmf-dist
$RPM_BUILD_ROOT%{texmfdist}
%{__mv} $RPM_BUILD_ROOT%{_datadir}/texlive-20080822-texmf/texmf-doc
$RPM_BUILD_ROOT%{texmfdoc}
-%{__mv} $RPM_BUILD_ROOT%{texmfdist}/dvips/* $RPM_BUILD_ROOT%{texmf}
-%{__mv} $RPM_BUILD_ROOT%{texmfdist}/tex/* $RPM_BUILD_ROOT%{texmf}
+# %{__mv} $RPM_BUILD_ROOT%{texmfdist}/dvips/* $RPM_BUILD_ROOT%{texmf}
+# %{__mv} $RPM_BUILD_ROOT%{texmfdist}/tex/* $RPM_BUILD_ROOT%{texmf}
# This is an empty directory
%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/texlive-20080822-texmf
@@ -4644,11 +4644,11 @@
%dir %{_localstatedir}/fonts/map
# %ghost %{_localstatedir}/ls-R
-%config(noreplace) %verify(not md5 mtime size)
%{texmf}/tex/cslatex/base/fonttext.cfg
+%config(noreplace) %verify(not md5 mtime size)
%{texmfdist}/tex/cslatex/base/fonttext.cfg
%config(noreplace) %verify(not md5 mtime size)
%{texmf}/tex/generic/config/language.dat
-%config(noreplace) %verify(not md5 mtime size)
%{texmf}/tex/latex/base/fontmath.cfg
-%config(noreplace) %verify(not md5 mtime size)
%{texmf}/tex/latex/base/fonttext.cfg
-%config(noreplace) %verify(not md5 mtime size)
%{texmf}/tex/latex/base/preload.cfg
+%config(noreplace) %verify(not md5 mtime size)
%{texmfdist}/tex/latex/base/fontmath.cfg
+%config(noreplace) %verify(not md5 mtime size)
%{texmfdist}/tex/latex/base/fonttext.cfg
+%config(noreplace) %verify(not md5 mtime size)
%{texmfdist}/tex/latex/base/preload.cfg
%config(noreplace) %verify(not md5 mtime size) %{texmf}/web2c/fmtutil.cnf
%config(noreplace) %verify(not md5 mtime size) %{texmf}/web2c/mktex.cnf
@@ -4685,6 +4685,7 @@
%dir %{texmf}/doc/tetex
%dir %{texmfdist}/tex
+%dir %{texmfdist}/tex/cslatex
%dir %{texmfdist}/tex/generic
%dir %{texmfdist}/tex/generic/enctex
%dir %{texmfdist}/tex/generic/genmisc
@@ -4703,15 +4704,12 @@
%dir %{texmf}/fonts/map/dvips/tetex
%dir %{texmf}/scripts
%dir %{texmf}/tex
-%dir %{texmf}/tex/cslatex
-%dir %{texmf}/tex/cslatex/base
%dir %{texmf}/tex/generic
%dir %{texmf}/tex/generic/config
-%dir %{texmf}/tex/generic/misc
%dir %{texmf}/web2c
# Docs
-%doc %{texmf}/doc/README
+# %doc %{texmf}/doc/README
%doc %{texmf}/doc/tetex/TETEXDOC.*
%doc %{texmf}/doc/tetex/teTeX-FAQ
@@ -4734,19 +4732,19 @@
%{texmf}/fonts/enc/dvips/tetex/f7b6d320.enc
%{texmf}/fonts/map/dvips/tetex/ps2pk35.map
+%{texmfdist}/tex/generic/encodings
+%{texmfdist}/tex/generic/epsf
%{texmfdist}/tex/generic/genmisc/random.tex
+%{texmfdist}/tex/generic/misc/null*
%{texmfdist}/tex/generic/misc/texnames.sty
+%{texmfdist}/tex/generic/tap
+%{texmfdist}/tex/generic/tex-ps
%{texmfdist}/tex/generic/tex4ht/path.4ht
%{texmfdist}/tex/latex/localloc
%{texmfdist}/tex/latex/ltxmisc/path.sty
+%{texmfdist}/tex/texinfo
%{texmf}/tex/fontinst
-%{texmf}/tex/generic/encodings
-%{texmf}/tex/generic/epsf
%{texmf}/tex/generic/hyphen
-%{texmf}/tex/generic/misc/null*
-%{texmf}/tex/generic/tap
-%{texmf}/tex/generic/tex-ps
-%{texmf}/tex/texinfo
# %{fmtdir}/metafun.mem
#%{texmf}/web2c/tex-pl.pool
@@ -5049,7 +5047,7 @@
%{_mandir}/man1/dvitype.1*
%{texmf}/dvips/base
%{texmf}/dvips/gsftopk
-%{texmf}/dvips/psfrag
+%{texmfdist}/dvips/psfrag
%config(noreplace) %verify(not md5 mtime size) %{texmf}/dvips/config/config.ps
%{texmfdist}/fonts/enc/dvips/base
%{texmfdist}/fonts/map/dvips/cmex/ttcmex.map
@@ -5231,7 +5229,7 @@
%{texmfdist}/fonts/map/dvips/omega
%{texmfdist}/omega/ocp
%{texmfdist}/omega/otp
-%{texmf}/tex/lambda
+%{texmfdist}/tex/lambda
%{_mandir}/man1/mkocp.1*
%{_mandir}/man1/mkofm.1*
%{_mandir}/man1/omega.1*
@@ -5276,28 +5274,28 @@
%files format-mex
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/mex
-%{texmf}/tex/mex/config/mex.ini
+%{texmfdist}/tex/mex/config/mex.ini
# %config(noreplace) %verify(not md5 mtime size) %{fmtdir}/mex.fmt
%files format-pdfmex
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/pdfmex
-%{texmf}/tex/mex/config/pdfmex.ini
+%{texmfdist}/tex/mex/config/pdfmex.ini
# %config(noreplace) %verify(not md5 mtime size) %{fmtdir}/pdfmex.fmt
%files format-utf8mex
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/utf8mex
-#%doc %{texmf}/doc/mex/utf8mex
-%{texmf}/tex/mex/utf8mex
+%doc %{texmfdist}/doc/mex/utf8mex
+%{texmfdist}/tex/mex/utf8mex
# %config(noreplace) %verify(not md5 mtime size) %{fmtdir}/utf8mex.fmt
%files amstex
%defattr(644,root,root,755)
-%dir %{texmf}/tex/amstex
-%{texmf}/tex/amstex/base
-%{texmf}/tex/amstex/config
-%{texmf}/tex/plain/amsfonts
+%dir %{texmfdist}/tex/amstex
+%{texmfdist}/tex/amstex/base
+%{texmfdist}/tex/amstex/config
+%{texmfdist}/tex/plain/amsfonts
%files format-amstex
%defattr(644,root,root,755)
@@ -5339,8 +5337,8 @@
%defattr(644,root,root,755)
# %doc %{texmf}/doc/cstex/INSTALL.cslatex
# %doc %{texmf}/doc/cstex/README.cslatex
-%{texmf}/tex/cslatex
-%{texmf}/tex/latex/cslatex
+%{texmfdist}/tex/cslatex
+%{texmfdist}/tex/latex/cslatex
%files format-cslatex
%defattr(644,root,root,755)
@@ -5434,17 +5432,17 @@
%files format-context-de
%defattr(644,root,root,755)
-%{texmf}/tex/context/config/cont-de.ini
+%{texmfdist}/tex/context/config/cont-de.ini
# %config(noreplace) %verify(not md5 mtime size) %{fmtdir}/cont-de.fmt
#%{_mandir}/man1/cont-de.1*
%files format-context-en
%defattr(644,root,root,755)
-%{texmf}/tex/context/config/cont-en.ini
+%{texmfdist}/tex/context/config/cont-en.ini
# %config(noreplace) %verify(not md5 mtime size) %{fmtdir}/cont-en.fmt
#%{_mandir}/man1/cont-en.1*
# what is the difference betwen uk and en in this particular situation?
-%{texmf}/tex/context/config/cont-uk.ini
+%{texmfdist}/tex/context/config/cont-uk.ini
# %config(noreplace) %verify(not md5 mtime size) %{fmtdir}/cont-uk.fmt
# no fmt, so commented out
@@ -5454,7 +5452,7 @@
%files format-context-nl
%defattr(644,root,root,755)
-%{texmf}/tex/context/config/cont-nl.ini
+%{texmfdist}/tex/context/config/cont-nl.ini
# %config(noreplace) %verify(not md5 mtime size) %{fmtdir}/cont-nl.fmt
#%{_mandir}/man1/cont-nl.1*
@@ -5478,8 +5476,8 @@
%dir %{texmfdist}/tex/latex/hyper
%dir %{texmfdist}/tex/latex/misc209
%dir %{texmfdist}/tex/plain
-%dir %{texmf}/tex/latex
-%dir %{texmf}/tex/latex/base
+%dir %{texmfdist}/tex/latex
+%dir %{texmfdist}/tex/latex/base
# %{texmfdist}/tex/latex/citesort
# %{texmfdist}/tex/latex/dvilj
@@ -5663,7 +5661,7 @@
%files latex-ae
%defattr(644,root,root,755)
-%{texmf}/tex/latex/ae
+%{texmfdist}/tex/latex/ae
%files latex-ams
%defattr(644,root,root,755)
@@ -5682,7 +5680,7 @@
%files latex-antt
%defattr(644,root,root,755)
-%{texmf}/tex/latex/antt
+%{texmfdist}/tex/latex/antt
%files latex-bbm
%defattr(644,root,root,755)
@@ -5785,7 +5783,7 @@
%files latex-cite
%defattr(644,root,root,755)
-%{texmf}/tex/latex/cite
+%{texmfdist}/tex/latex/cite
%files latex-cmbright
%defattr(644,root,root,755)
@@ -5795,7 +5793,7 @@
%files latex-concmath
%defattr(644,root,root,755)
-%{texmf}/tex/latex/concmath
+%{texmfdist}/tex/latex/concmath
%files latex-custom-bib
%defattr(644,root,root,755)
@@ -5863,7 +5861,7 @@
%files latex-marvosym
%defattr(644,root,root,755)
-%{texmf}/tex/latex/marvosym
+%{texmfdist}/tex/latex/marvosym
%files latex-mathpple
%defattr(644,root,root,755)
@@ -5965,7 +5963,7 @@
%files latex-umlaute
%defattr(644,root,root,755)
-%{texmf}/tex/latex/umlaute
+%{texmfdist}/tex/latex/umlaute
# %files latex-urwvn
# %defattr(644,root,root,755)
@@ -6038,7 +6036,8 @@
%files tex-pictex
%defattr(644,root,root,755)
-%{texmf}/tex/generic/pictex
+%doc %{texmfdist}/doc/generic/pictex
+%{texmfdist}/tex/generic/pictex
%files tex-pstricks
%defattr(644,root,root,755)
@@ -6057,7 +6056,6 @@
%{texmfdist}/fonts/tfm/public/qpxqtx
%{texmfdist}/fonts/vf/public/qpxqtx
%{texmfdist}/tex/generic/qpxqtx
-%{texmf}/tex/generic/qpxqtx
%files tex-ruhyphen
%defattr(644,root,root,755)
@@ -6117,9 +6115,6 @@
%{texmfdist}/source/latex/xkeyval
%{texmfdist}/tex/generic/xkeyval
%{texmfdist}/tex/latex/xkeyval
-%{texmf}/tex/generic/xkeyval
-%{texmf}/tex/latex/xkeyval
-
%files fonts-adobe
%defattr(644,root,root,755)
@@ -6153,7 +6148,6 @@
%{texmfdist}/fonts/map/dvips/ams
%{texmfdist}/tex4ht/ht-fonts/unicode/ams
%{texmfdist}/tex4ht/ht-fonts/alias/ams
-%{texmf}/dvips/ams
%files fonts-antp
%defattr(644,root,root,755)
@@ -6176,8 +6170,6 @@
%{texmfdist}/tex/latex/antt
%{texmfdist}/tex4ht/ht-fonts/unicode/antt
%{texmfdist}/tex4ht/ht-fonts/alias/antt
-%{texmf}/tex/latex/antt
-%{texmf}/tex/plain/antt
%files fonts-bbm
%defattr(644,root,root,755)
@@ -6186,7 +6178,6 @@
%{texmfdist}/fonts/tfm/public/bbm
%{texmfdist}/source/latex/bbm
%{texmfdist}/tex/latex/bbm
-%{texmf}/tex/latex/bbm
%files fonts-bbold
%defattr(644,root,root,755)
@@ -6250,7 +6241,6 @@
%{texmfdist}/tex4ht/ht-fonts/alias/cm
%{texmfdist}/tex4ht/ht-fonts/win/1251/cm
%{texmfdist}/tex4ht/ht-fonts/css/emacspeak/cm
-%{texmf}/dvips/cm
%files fonts-cmbright
@@ -6260,7 +6250,6 @@
%{texmfdist}/fonts/tfm/public/cmbright
%{texmfdist}/source/latex/cmbright
%{texmfdist}/tex/latex/cmbright
-%{texmf}/tex/latex/cmbright
%files fonts-cmcyr
%defattr(644,root,root,755)
@@ -6288,7 +6277,6 @@
%{texmfdist}/fonts/tfm/public/concmath
%{texmfdist}/source/latex/concmath
%{texmfdist}/tex/latex/concmath
-%{texmf}/tex/latex/concmath
%files fonts-concrete
%defattr(644,root,root,755)
@@ -6326,7 +6314,6 @@
%{texmfdist}/fonts/map/dvips/eurosym
%{texmfdist}/source/fonts/eurosym
%{texmfdist}/tex/latex/eurosym
-%{texmf}/tex/latex/eurosym
%files fonts-eulervm
%defattr(644,root,root,755)
@@ -6335,7 +6322,6 @@
%{texmfdist}/fonts/vf/public/eulervm
%{texmfdist}/source/latex/eulervm
%{texmfdist}/tex/latex/eulervm
-%{texmf}/tex/latex/eulervm
%files fonts-euxm
%defattr(644,root,root,755)
@@ -6352,7 +6338,6 @@
%{texmfdist}/fonts/tfm/public/gothic
%{texmfdist}/fonts/vf/public/gothic
%{texmfdist}/fonts/map/dvips/gothic
-%{texmf}/dvips/gothic
%files fonts-hoekwater
%defattr(644,root,root,755)
@@ -6374,7 +6359,6 @@
%{texmfdist}/fonts/tfm/public/esint
%{texmfdist}/source/latex/esint
%{texmfdist}/tex/latex/esint
-%{texmf}/tex/latex/esint
%files fonts-lh
%defattr(644,root,root,755)
@@ -6403,7 +6387,6 @@
%{texmfdist}/tex/latex/lm
%{texmfdist}/tex4ht/ht-fonts/unicode/lm
%{texmfdist}/tex4ht/ht-fonts/alias/lm
-%{texmf}/tex/latex/lm
%files fonts-marvosym
%defattr(644,root,root,755)
@@ -6416,7 +6399,6 @@
%{texmfdist}/tex/latex/marvosym
%{texmfdist}/tex4ht/ht-fonts/unicode/marvosym
%{texmfdist}/tex4ht/ht-fonts/alias/marvosym
-%{texmf}/tex/latex/marvosym
%files fonts-mflogo
%defattr(644,root,root,755)
@@ -6429,7 +6411,6 @@
%{texmfdist}/source/latex/mflogo
%{texmfdist}/tex/latex/mflogo
%{texmfdist}/tex4ht/ht-fonts/unicode/mflogo
-%{texmf}/tex/latex/mflogo
%files fonts-misc
%defattr(644,root,root,755)
@@ -6446,6 +6427,9 @@
%files fonts-omega
%defattr(644,root,root,755)
%doc %{texmfdist}/doc/omega
+%dir %{texmfdist}/omega
+%dir %{texmfdist}/omega/otp
+%dir %{texmfdist}/omega/ocp
%{texmfdist}/dvips/omega
%{texmfdist}/fonts/ofm/public/omega
%{texmfdist}/fonts/type1/public/omega
@@ -6454,14 +6438,9 @@
%{texmfdist}/fonts/tfm/public/omega
%{texmfdist}/fonts/ovf/public/omega
%{texmfdist}/fonts/map/dvips/omega
-%dir %{texmfdist}/omega
-%dir %{texmfdist}/omega/otp
-%dir %{texmfdist}/omega/ocp
%{texmfdist}/omega/ocp/omega
%{texmfdist}/omega/otp/omega
%{texmfdist}/tex/plain/omega
-%{texmf}/dvips/omega
-%{texmf}/tex/plain/omega
%files fonts-pazo
%defattr(644,root,root,755)
@@ -6479,7 +6458,6 @@
%{texmfdist}/fonts/map/dvips/pl
%{texmfdist}/tex4ht/ht-fonts/unicode/pl
%{texmfdist}/tex4ht/ht-fonts/alias/pl
-%{texmf}/dvips/pl
%{texmf}/scripts/texlive/tlmgrgui/lang/pl
%files fonts-px
@@ -6496,7 +6474,6 @@
%{texmfdist}/fonts/vf/public/pxfonts
%{texmfdist}/tex4ht/ht-fonts/unicode/pxfonts
%{texmfdist}/tex4ht/ht-fonts/alias/pxfonts
-%{texmf}/tex/latex/pxfonts/pxfonts.sty
%{texmfdist}/tex/latex/pxfonts/pxfonts.sty
%files fonts-qfonts
@@ -6681,7 +6658,6 @@
%files fonts-type1-xypic
%defattr(644,root,root,755)
-%{texmf}/dvips/xypic
%{texmfdist}/fonts/type1/public/xypic
# TeXLive-specific
@@ -6699,7 +6675,8 @@
%files cefutils
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/cef*
-%{texmf}/tex/latex/cjk/CEF
+%dir %{texmfdist}/tex/latex/cjk
+%{texmfdist}/tex/latex/cjk/CEF
%doc %{texmfdist}/doc/latex/cjk/doc
%doc %{texmfdist}/doc/latex/cjk/examples
%{texmfdist}/source/latex/cjk/utils/CEFconv
@@ -6761,6 +6738,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.66 2008/12/26 10:28:38 uzsolt
+- don't mix texmf and texmf-dist
+
Revision 1.65 2008/12/25 23:02:45 uzsolt
- unpack of texlive-texmf moved to %install
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/texlive.spec?r1=1.65&r2=1.66&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
