packages: texlive/texlive.spec - more fixing

[uzsolt]

Author: uzsolt                       Date: Sun May 17 09:56:07 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- more fixing

---- Files affected:
packages/texlive:
   texlive.spec (1.269 -> 1.270) 

---- Diffs:

================================================================
Index: packages/texlive/texlive.spec
diff -u packages/texlive/texlive.spec:1.269 packages/texlive/texlive.spec:1.270
--- packages/texlive/texlive.spec:1.269	Sun May 17 11:21:52 2009
+++ packages/texlive/texlive.spec	Sun May 17 11:56:01 2009
@@ -2637,6 +2637,7 @@
 Requires:	%{name}-fonts-lm = %{epoch}:%{version}-%{release}
 Requires:	%{name}-latex = %{epoch}:%{version}-%{release}
 Obsoletes:	tetex-latex-lm
+Obsoletes:	%{name}-fonts-type1-lm
 
 %description latex-lm
 Latin Modern family of fonts, based on the Computer Modern fonts
@@ -4597,6 +4598,7 @@
 Requires:	%{name}-dirs-fonts = %{epoch}:%{version}-%{release}
 Provides:	tetex-fonts-cmcyr
 Obsoletes:	tetex-fonts-cmcyr
+Obsoletes:	%{name}-fonts-type1-cmcyr
 
 %description fonts-cmcyr
 Computer Modern fonts extended with Russian letters.
@@ -9725,11 +9727,6 @@
 %{texmfdist}/source/latex/g-brief
 %{texmfdist}/tex/latex/g-brief
 
-%files latex-jknappen
-%defattr(644,root,root,755)
-%doc %{texmfdist}/fonts/source/jknappen
-%{texmfdist}/fonts/tfm/jknappen
-
 %files latex-keystroke
 %defattr(644,root,root,755)
 %{texmfdist}/tex/latex/keystroke
@@ -9777,8 +9774,6 @@
 %{texmfdist}/fonts/enc/dvips/lm
 %{texmfdist}/fonts/map/dvips/lm
 %{texmfdist}/fonts/map/dvipdfm/lm
-%{texmfdist}/fonts/opentype/public/lm
-%{texmfdist}/fonts/tfm/public/lm
 %{texmfdist}/source/fonts/lm
 
 %files latex-lucidabr
@@ -12154,7 +12149,6 @@
 %{texmfdist}/tex/latex/pxfonts
 %{texmfdist}/fonts/type1/public/pxfonts
 %{texmfdist}/fonts/afm/public/pxfonts
-%{texmfdist}/fonts/tfm/public/pxfonts
 %{texmfdist}/fonts/vf/public/pxfonts
 %{texmfdist}/fonts/map/dvips/pxfonts
 
@@ -12187,7 +12181,6 @@
 %{texmfdist}/fonts/type1/public/txfonts
 %{texmfdist}/fonts/afm/public/txfonts
 %{texmfdist}/fonts/enc/dvips/txfonts
-%{texmfdist}/fonts/tfm/public/txfonts
 %{texmfdist}/fonts/vf/public/txfonts
 %{texmfdist}/fonts/map/dvips/txfonts
 %{texmfdist}/tex/latex/txfonts
@@ -12282,7 +12275,6 @@
 %files tex-qpxqtx
 %defattr(644,root,root,755)
 %doc %{texmfdist}/doc/fonts/qpxqtx
-%{texmfdist}/fonts/tfm/public/qpxqtx
 %{texmfdist}/fonts/vf/public/qpxqtx
 %{texmfdist}/tex/generic/qpxqtx
 
@@ -12377,8 +12369,6 @@
 %files fonts-ams
 %defattr(644,root,root,755)
 %{texmfdist}/fonts/source/public/ams
-%{texmfdist}/fonts/type1/bluesky/ams
-%{texmfdist}/fonts/afm/bluesky/ams
 %{texmfdist}/fonts/tfm/public/ams
 %{texmfdist}/fonts/map/dvips/ams
 
@@ -12569,7 +12559,6 @@
 %dir %{texmfdist}/fonts/map/dvips/latex-fonts
 %dir %{texmfdist}/fonts/source/public/latex-fonts
 %dir %{texmfdist}/fonts/tfm/public/latex-fonts
-%dir %{texmfdist}/fonts/type1/bluesky/latex-fonts
 %doc %{texmfdist}/doc/latex/esint
 %{texmfdist}/fonts/afm/bluesky/latex-fonts/*
 %{texmfdist}/fonts/map/dvips/latex-fonts/*
@@ -12577,7 +12566,6 @@
 %{texmfdist}/fonts/source/public/latex-fonts/*
 %{texmfdist}/fonts/tfm/public/esint
 %{texmfdist}/fonts/tfm/public/latex-fonts/*
-%{texmfdist}/fonts/type1/bluesky/latex-fonts/*
 %{texmfdist}/source/latex/esint
 %{texmfdist}/tex/latex/esint
 
@@ -12618,7 +12606,6 @@
 %files fonts-mflogo
 %defattr(644,root,root,755)
 %{texmfdist}/fonts/source/public/mflogo
-%{texmfdist}/fonts/type1/hoekwater/mflogo
 %{texmfdist}/fonts/afm/hoekwater/mflogo
 %{texmfdist}/fonts/tfm/public/mflogo
 %{texmfdist}/fonts/map/dvips/mflogo
@@ -13643,10 +13630,6 @@
 %doc %{texmfdist}/doc/fonts/cc-pl
 %{texmfdist}/fonts/type1/public/cc-pl
 
-%files fonts-type1-cmcyr
-%defattr(644,root,root,755)
-%{texmfdist}/fonts/type1/public/cmcyr
-
 %files fonts-type1-cs
 %defattr(644,root,root,755)
 %{texmfdist}/fonts/type1/public/cs
@@ -13666,11 +13649,6 @@
 %{texmfdist}/fonts/type1/public/fpl
 %{texmfdist}/source/fonts/fpl
 
-%files fonts-type1-lm
-%defattr(644,root,root,755)
-%{texmfdist}/fonts/afm/public/lm
-%{texmfdist}/fonts/type1/public/lm
-
 %files fonts-type1-marvosym
 %defattr(644,root,root,755)
 %{texmfdist}/fonts/type1/public/marvosym
@@ -13884,6 +13862,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.270  2009/05/17 09:56:01  uzsolt
+- more fixing
+
 Revision 1.269  2009/05/17 09:21:52  uzsolt
 - fixed some multiple packaging
 - tex-pstricks requires dvips
================================================================

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