packages: texlive/texlive.spec - merged metafont with main package (they ca...

baggins baggins at pld-linux.org
Mon Jul 13 22:54:52 CEST 2009 

Author: baggins                      Date: Mon Jul 13 20:54:52 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged metafont with main package (they cannot exist separately)

---- Files affected:
packages/texlive:
   texlive.spec (1.282 -> 1.283) 

---- Diffs:

================================================================
Index: packages/texlive/texlive.spec
diff -u packages/texlive/texlive.spec:1.282 packages/texlive/texlive.spec:1.283
--- packages/texlive/texlive.spec:1.282	Mon Jul 13 22:41:56 2009
+++ packages/texlive/texlive.spec	Mon Jul 13 22:54:46 2009
@@ -12,11 +12,6 @@
 #error:     texconfig-20080816-5.x86_64              Requires: texlive-dvips = 1:20080816-5
 #error: removing texlive-dvips-20080816-5.x86_64 "Requires(auto): libkpathsea.so.4()(64bit)" from tsort relations.
 #error:     texlive-dvips-20080816-5.x86_64          Requires(auto): libkpathsea.so.4()(64bit)
-#error: LOOP:
-#error: removing texlive-20080816-5.x86_64 "Requires: texlive-metafont = 1:20080816-5" from tsort relations.
-#error:     texlive-20080816-5.x86_64                Requires: texlive-metafont = 1:20080816-5
-#error: removing texlive-metafont-20080816-5.x86_64 "Requires(post): /usr/bin/texhash" from tsort relations.
-#error:     texlive-metafont-20080816-5.x86_64       Requires(post): /usr/bin/texhash
 #Preparing...                ########################################### [100%]
 
 %include	/usr/lib/rpm/macros.perl
@@ -127,7 +122,6 @@
 BuildRequires:	%{name}-format-pdflatex
 BuildRequires:	%{name}-latex
 BuildRequires:	%{name}-latex-cyrillic
-BuildRequires:	%{name}-metafont
 BuildRequires:	%{name}-metapost
 BuildRequires:	%{name}-mex
 BuildRequires:	%{name}-omega
@@ -152,7 +146,6 @@
 Requires:	%{name}-dirs-fonts = %{epoch}:%{version}-%{release}
 Requires:	%{name}-fonts-cm = %{epoch}:%{version}-%{release}
 Requires:	%{name}-fonts-misc = %{epoch}:%{version}-%{release}
-Requires:	%{name}-metafont = %{epoch}:%{version}-%{release}
 Requires:	awk
 Requires:	dialog
 Requires:	kpathsea = %{epoch}:%{version}-%{release}
@@ -163,6 +156,7 @@
 Suggests:	tmpwatch
 Provides:	tetex = %{epoch}:%{version}-%{release}
 Provides:	tetex-format-pdfetex = %{epoch}:%{version}-%{release}
+Provides:	tetex-metafont
 Obsoletes:	tetex
 Obsoletes:	tetex-afm
 Obsoletes:	tetex-doc
@@ -178,6 +172,7 @@
 Obsoletes:	tetex-format-pdfetex
 Obsoletes:	tetex-latex-vnps
 Obsoletes:	tetex-latex-vnr
+Obsoletes:	tetex-metafont
 Obsoletes:	tetex-oxdvi
 Obsoletes:	tetex-plain-dvips
 Obsoletes:	tetex-plain-mathtime
@@ -185,6 +180,7 @@
 Obsoletes:	tetex-plain-plnfss
 Obsoletes:	tetex-tex-hyphen
 Obsoletes:	tetex-tex-vietnam
+Obsoletes:	texlive-metafont
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		texmf	%{_datadir}/texmf
@@ -763,22 +759,6 @@
 %description tex-ytex -l hu.UTF-8
 MIT-en fejlesztett makrócsomag.
 
-%package metafont
-Summary:	MetaFont
-Summary(hu.UTF-8):	MetaFont
-Summary(pl.UTF-8):	Zestaw narzędzi MetaFont
-Group:		Applications/Publishing/TeX
-Requires(post,postun):	%{_bindir}/texhash
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Provides:	tetex-metafont
-Obsoletes:	tetex-metafont
-
-%description metafont
-MetaFont.
-
-%description metafont -l pl.UTF-8
-Zestaw narzędzi MetaFont.
-
 %package metapost
 Summary:	MetaPost
 Summary(hu.UTF-8):	MetaPost
@@ -864,7 +844,6 @@
 Group:		Applications/Publishing/TeX
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name}-dvips = %{epoch}:%{version}-%{release}
-Requires:	%{name}-metafont = %{epoch}:%{version}-%{release}
 Requires:	xdvi = %{epoch}:%{version}-%{release}
 Obsoletes:	tetex-texconfig
 
@@ -885,7 +864,6 @@
 Group:		Applications/Publishing/TeX
 Requires(post,postun):	%{_bindir}/texhash
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	%{name}-metafont = %{epoch}:%{version}-%{release}
 Suggests:	%{name}-dvips
 Obsoletes:	tetex-xdvi
 
@@ -4027,11 +4005,11 @@
 Summary(pl.UTF-8):	Pakiet makr PDF LaTeX
 Group:		Applications/Publishing/TeX
 Requires(post,postun):	%{_bindir}/texhash
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name}-fonts-jknappen = %{epoch}:%{version}-%{release}
 Requires:	%{name}-fonts-type1-urw = %{epoch}:%{version}-%{release}
 Requires:	%{name}-latex = %{epoch}:%{version}-%{release}
 Requires:	%{name}-latex-psnfss = %{epoch}:%{version}-%{release}
-Requires:	%{name}-metafont = %{epoch}:%{version}-%{release}
 Requires:	%{name}-pdftex = %{epoch}:%{version}-%{release}
 Provides:	tetex-format-pdflatex
 Obsoletes:	tetex-format-pdflatex
@@ -6048,12 +6026,6 @@
 %postun tex-ytex
 %texhash
 
-%post metafont
-%texhash
-
-%postun metafont
-%texhash
-
 %post metapost
 %texhash
 
@@ -7448,6 +7420,12 @@
 %attr(755,root,root) %{_bindir}/kpsewhere
 %attr(755,root,root) %{_bindir}/mag
 %attr(755,root,root) %{_bindir}/makempx
+%attr(755,root,root) %{_bindir}/mf
+%attr(755,root,root) %{_bindir}/mf-nowin
+%attr(755,root,root) %{_bindir}/mft
+%attr(755,root,root) %{_bindir}/mktexmf
+%attr(755,root,root) %{_bindir}/mktexpk
+%attr(755,root,root) %{_bindir}/mktextfm
 %attr(755,root,root) %{_bindir}/mktexfmt
 %attr(755,root,root) %{_bindir}/mktexlsr
 %attr(755,root,root) %{_bindir}/newer
@@ -7522,6 +7500,7 @@
 %dir %{texmfdist}/doc/generic/enctex
 %dir %{texmfdist}/doc/latex
 %dir %{texmfdist}/doc/latex/localloc
+%dir %{texmfdist}/mft
 %dir %{texmfdist}/tex
 %dir %{texmfdist}/tex/cslatex
 %dir %{texmfdist}/tex/cslatex/base
@@ -7589,6 +7568,9 @@
 %{texmf}/fonts/enc/dvips/tetex/f7b6d320.enc
 %{texmf}/fonts/map/dvips/tetex/ps2pk35.map
 
+%{texmfdist}/metafont
+%{texmfdist}/mft/base
+%{texmfdist}/source/metafont
 %{texmfdist}/tex/fontinst
 %{texmfdist}/tex/generic/dehyph-exptl/*
 %{texmfdist}/tex/generic/encodings
@@ -7602,6 +7584,7 @@
 %{texmfdist}/tex/texinfo
 %{texmf}/tex/fontinst
 %{texmf}/tex/generic/hyphen
+%{texmf}/fmtutil/format.metafont.cnf
 %{texmf}/fonts/map/dvips/updmap/*
 %{texmf}/web2c/*.tcx
 
@@ -7630,6 +7613,12 @@
 %{_mandir}/man1/mag.1*
 %{_mandir}/man1/makempx.1*
 %{_mandir}/man1/makempy.1*
+%{_mandir}/man1/mf.1*
+%{_mandir}/man1/mf-nowin.1*
+%{_mandir}/man1/mft.1*
+%{_mandir}/man1/mktexmf.1*
+%{_mandir}/man1/mktexpk.1*
+%{_mandir}/man1/mktextfm.1*
 %{_mandir}/man1/mktexfmt.1*
 %{_mandir}/man1/mktexlsr.1*
 %{_mandir}/man1/newer.1*
@@ -8225,26 +8214,6 @@
 %defattr(644,root,root,755)
 %{texmfdist}/tex/ytex
 
-%files metafont
-%defattr(644,root,root,755)
-%dir %{texmfdist}/mft
-%attr(755,root,root) %{_bindir}/mf
-%attr(755,root,root) %{_bindir}/mf-nowin
-%attr(755,root,root) %{_bindir}/mft
-%attr(755,root,root) %{_bindir}/mktexmf
-%attr(755,root,root) %{_bindir}/mktexpk
-%attr(755,root,root) %{_bindir}/mktextfm
-%{texmfdist}/metafont
-%{texmfdist}/mft/base
-%{texmfdist}/source/metafont
-%{texmf}/fmtutil/format.metafont.cnf
-%{_mandir}/man1/mf.1*
-%{_mandir}/man1/mf-nowin.1*
-%{_mandir}/man1/mft.1*
-%{_mandir}/man1/mktexmf.1*
-%{_mandir}/man1/mktexpk.1*
-%{_mandir}/man1/mktextfm.1*
-
 %files metapost
 %defattr(644,root,root,755)
 %dir %{texmfdist}/metapost
@@ -13870,6 +13839,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.283  2009/07/13 20:54:46  baggins
+- merged metafont with main package (they cannot exist separately)
+
 Revision 1.282  2009/07/13 20:41:56  baggins
 - added mex.fmt
 
================================================================

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

More information about the pld-cvs-commit mailing list