packages: texlive/texlive.spec - moved dirs-fonts to texlive-texmf - delete...
uzsolt
uzsolt at pld-linux.org
Tue Nov 24 22:18:04 CET 2009
Author: uzsolt Date: Tue Nov 24 21:18:04 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- moved dirs-fonts to texlive-texmf
- delete versioned requires
- small other fixes
---- Files affected:
packages/texlive:
texlive.spec (1.305 -> 1.306)
---- Diffs:
================================================================
Index: packages/texlive/texlive.spec
diff -u packages/texlive/texlive.spec:1.305 packages/texlive/texlive.spec:1.306
--- packages/texlive/texlive.spec:1.305 Sun Nov 22 13:35:10 2009
+++ packages/texlive/texlive.spec Tue Nov 24 22:17:58 2009
@@ -148,9 +148,9 @@
BuildRequires: xorg-lib-libXmu-devel
BuildRequires: xorg-lib-libXpm-devel
BuildRequires: zlib-devel >= 1.2.1
-Requires: %{name}-dirs-fonts = %{epoch}:%{version}-%{release}
-Requires: %{name}-fonts-cm = %{epoch}:%{version}-%{release}
-Requires: %{name}-fonts-misc = %{epoch}:%{version}-%{release}
+Requires: %{name}-dirs-fonts
+Requires: %{name}-fonts-cm
+Requires: %{name}-fonts-misc
Requires: awk
Requires: dialog
Requires: kpathsea = %{epoch}:%{version}-%{release}
@@ -1415,7 +1415,8 @@
Group: Applications/Publishing/TeX
Requires(post,postun): %{_bindir}/texhash
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: %{name}-fonts-type1-bluesky = %{epoch}:%{version}-%{release}
+# ams provides bluesky fonts
+Requires: %{name}-fonts-ams
Requires: ghostscript
Provides: tetex-format-pdftex = %{epoch}:%{version}-%{release}
Provides: tetex-pdftex
@@ -1806,22 +1807,23 @@
Group: Applications/Publishing/TeX
Requires(post,postun): %{_bindir}/texhash
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: %{name}-fonts-latex = %{epoch}:%{version}-%{release}
-Requires: %{name}-tex-ruhyphen = %{epoch}:%{version}-%{release}
-Requires: %{name}-tex-ukrhyph = %{epoch}:%{version}-%{release}
+Requires: %{name}-fonts-latex
+Requires: %{name}-tex-ruhyphen
+Requires: %{name}-tex-ukrhyph
# for misc/eurosym:
-Requires: %{name}-fonts-eurosym = %{epoch}:%{version}-%{release}
+Requires: %{name}-fonts-eurosym
Requires: %{name}-latex-data
-Requires: %{name}-pdftex = %{epoch}:%{version}-%{release}
-Requires: %{name}-tex-babel = %{epoch}:%{version}-%{release}
-Requires: %{name}-tex-pstricks = %{epoch}:%{version}-%{release}
+Requires: %{name}-pdftex
+Requires: %{name}-tex-babel
+Requires: %{name}-tex-pstricks
Suggests: %{name}-fonts-jknappen
-Suggests: %{name}-latex-ucs = %{epoch}:%{version}-%{release}
-Provides: tetex-format-latex = %{epoch}:%{version}-%{release}
-Provides: tetex-latex = %{epoch}:%{version}-%{release}
+Suggests: %{name}-latex-ucs
+# Provides: tetex-format-latex = %{epoch}:%{version}-%{release}
+# Provides: tetex-latex = %{epoch}:%{version}-%{release}
Obsoletes: tetex-bibtex-koma-script
-Obsoletes: tetex-format-latex
-Obsoletes: tetex-latex
+# Can't install texlive-latex-data, so must delete
+# Obsoletes: tetex-format-latex
+# Obsoletes: tetex-latex
Obsoletes: tetex-latex-SIunits
Obsoletes: tetex-latex-caption
Obsoletes: tetex-latex-curves
@@ -7814,49 +7816,49 @@
# %doc %{texmf}/doc/sjisconv
# %doc %{texmf}/doc/vlna
-%files dirs-fonts
-%defattr(644,root,root,755)
-%dir %{texmfdist}/fonts
-%dir %{texmfdist}/fonts/afm
-%dir %{texmfdist}/fonts/afm/public
-%dir %{texmfdist}/fonts/afm/vntex
-%dir %{texmfdist}/fonts/enc
-%dir %{texmfdist}/fonts/enc/dvips
-%dir %{texmfdist}/fonts/enc/dvips/vntex
-%dir %{texmfdist}/fonts/map
-# %dir %{texmfdist}/fonts/map/dvipdfm
-# %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
-%dir %{texmfdist}/fonts/ovf
-%dir %{texmfdist}/fonts/ovf/public
-%dir %{texmfdist}/fonts/ovp
-%dir %{texmfdist}/fonts/ovp/public
-%dir %{texmfdist}/fonts/opentype
-%dir %{texmfdist}/fonts/opentype/public
-%dir %{texmfdist}/fonts/pk
-%dir %{texmfdist}/fonts/pk/ljfour
-%dir %{texmfdist}/fonts/source
-%dir %{texmfdist}/fonts/source/public
-%dir %{texmfdist}/fonts/source/vntex
-%dir %{texmfdist}/fonts/tfm
-%dir %{texmfdist}/fonts/tfm/public
-%dir %{texmfdist}/fonts/tfm/vntex
-%dir %{texmfdist}/fonts/truetype
-%dir %{texmfdist}/fonts/type1
-%dir %{texmfdist}/fonts/type1/public
-%dir %{texmfdist}/fonts/type1/vntex
-%dir %{texmfdist}/fonts/vf
-%dir %{texmfdist}/fonts/vf/public
-%dir %{texmfdist}/fonts/vf/vntex
-%dir %{texmfdist}/source/fonts
-%dir %{texmf}/fonts
-%dir %{texmf}/fonts/opentype
-%dir %{texmf}/fonts/opentype/public
+# %files dirs-fonts
+# %defattr(644,root,root,755)
+# %dir %{texmfdist}/fonts
+# %dir %{texmfdist}/fonts/afm
+# %dir %{texmfdist}/fonts/afm/public
+# %dir %{texmfdist}/fonts/afm/vntex
+# %dir %{texmfdist}/fonts/enc
+# %dir %{texmfdist}/fonts/enc/dvips
+# %dir %{texmfdist}/fonts/enc/dvips/vntex
+# %dir %{texmfdist}/fonts/map
+# # %dir %{texmfdist}/fonts/map/dvipdfm
+# # %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
+# %dir %{texmfdist}/fonts/ovf
+# %dir %{texmfdist}/fonts/ovf/public
+# %dir %{texmfdist}/fonts/ovp
+# %dir %{texmfdist}/fonts/ovp/public
+# %dir %{texmfdist}/fonts/opentype
+# %dir %{texmfdist}/fonts/opentype/public
+# %dir %{texmfdist}/fonts/pk
+# %dir %{texmfdist}/fonts/pk/ljfour
+# %dir %{texmfdist}/fonts/source
+# %dir %{texmfdist}/fonts/source/public
+# %dir %{texmfdist}/fonts/source/vntex
+# %dir %{texmfdist}/fonts/tfm
+# %dir %{texmfdist}/fonts/tfm/public
+# %dir %{texmfdist}/fonts/tfm/vntex
+# %dir %{texmfdist}/fonts/truetype
+# %dir %{texmfdist}/fonts/type1
+# %dir %{texmfdist}/fonts/type1/public
+# %dir %{texmfdist}/fonts/type1/vntex
+# %dir %{texmfdist}/fonts/vf
+# %dir %{texmfdist}/fonts/vf/public
+# %dir %{texmfdist}/fonts/vf/vntex
+# %dir %{texmfdist}/source/fonts
+# %dir %{texmf}/fonts
+# %dir %{texmf}/fonts/opentype
+# %dir %{texmf}/fonts/opentype/public
%files font-utils
%defattr(644,root,root,755)
@@ -8826,7 +8828,6 @@
%dir %{texmfdist}/scripts/fig4latex
%attr(755,root,root) %{texmfdist}/scripts/fig4latex/fig4latex
%attr(755,root,root) %{_bindir}/fig4latex
-%dir %{texmfdist}/scripts/pst-pdf
# %dir %{texmfdist}/source/generic
# %dir %{texmfdist}/tex/latex
# %dir %{texmfdist}/tex/latex/latexconfig
@@ -8837,7 +8838,6 @@
%{_mandir}/man1/pslatex.1*
# %{texmf}/fmtutil/format.latex.cnf
# %{texmfdist}/tex/latex/floatflt
-%{texmfdist}/scripts/pst-pdf/ps4pdf
# %{texmfdist}/tex/generic/pstricks
# %{texmfdist}/tex/generic/shapepar
# %{texmfdist}/tex/generic/textmerg
@@ -9377,8 +9377,8 @@
# %{texmfdist}/tex/plain/etex
# %{texmf}/tex/latex/config
# %{texmf}/tex/latex/dvipdfm
-%{fmtdir}/pdftex/latex.fmt
-%{fmtdir}/pdftex/mllatex.fmt
+# %{fmtdir}/pdftex/latex.fmt
+# %{fmtdir}/pdftex/mllatex.fmt
%{fmtdir}/mllatex
%{fmtdir}/latex
@@ -13966,6 +13966,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.306 2009/11/24 21:17:58 uzsolt
+- moved dirs-fonts to texlive-texmf
+- delete versioned requires
+- small other fixes
+
Revision 1.305 2009/11/22 12:35:10 uzsolt
- font directories
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/texlive/texlive.spec?r1=1.305&r2=1.306&f=u
More information about the pld-cvs-commit
mailing list