Author: glen Date: Tue Apr 28 21:18:07 2009 GMT Module: packages Tag: HEAD ---- Log message: - no macros in Obsoletes, adapter
---- Files affected: packages/texlive: texlive.spec (1.247 -> 1.248) ---- Diffs: ================================================================ Index: packages/texlive/texlive.spec diff -u packages/texlive/texlive.spec:1.247 packages/texlive/texlive.spec:1.248 --- packages/texlive/texlive.spec:1.247 Tue Apr 28 20:55:32 2009 +++ packages/texlive/texlive.spec Tue Apr 28 23:18:00 2009 @@ -58,7 +58,7 @@ Source6: xdvi.png Source10: http://tug.ctan.org/get/macros/latex/contrib/floatflt.zip # Source10-md5: 5d9fe14d289aa81ebb6b4761169dd5f2 -Source11: http://carme.pld-linux.org/~uzsolt/sources/texlive-fonts-larm.tar.bz2 +Source11: http://carme.pld-linux.org/~uzsolt/sources/%{name}-fonts-larm.tar.bz2 # Source11-md5: df2fcc66f0c2e90785ca6c9b27dacd34 Source50: http://sunsite2.icm.edu.pl/pub/tex/systems/texlive/tlnet/2008/tlpkg/TeXLive/Splashscreen.pm # Source50-md5: 5cc49f49010f27fdb02dd7053797ba19 @@ -119,6 +119,7 @@ BuildRequires: tetex-latex-cyrillic BuildRequires: tetex-tex-babel %else +BuildRequires: %{name}-context BuildRequires: %{name}-csplain BuildRequires: %{name}-fonts-cmsuper #BuildRequires: %{name}-format-amstex @@ -140,7 +141,6 @@ BuildRequires: %{name}-xetex BuildRequires: %{name}-xetex BuildRequires: %{name}-xmltex -BuildRequires: %{name}-context # fill with future texlive BR. guesses ones for now %endif BuildRequires: /usr/bin/latex @@ -258,9 +258,9 @@ %package other-utils Summary: Other utilities Group: Applications/Publishing/TeX -Obsoletes: tetex-format-cyrtexinfo -Obsoletes: jadetex Provides: jadetex +Obsoletes: jadetex +Obsoletes: tetex-format-cyrtexinfo %description other-utils Other utilities. @@ -1426,8 +1426,8 @@ Group: Applications/Printing Provides: psutils Obsoletes: psutils -Obsoletes: %{name}-epsutils -Obsoletes: %{name}-filters +Obsoletes: texlive-epsutils +Obsoletes: texlive-filters %description psutils This archive contains some utilities for manipulating PostScript @@ -1490,9 +1490,9 @@ Requires: %{name} = %{epoch}:%{version}-%{release} Provides: tetex-format-plain Provides: tetex-plain +Obsoletes: tetex-cyrplain Obsoletes: tetex-format-plain Obsoletes: tetex-plain -Obsoletes: tetex-cyrplain %description plain Plain TeX format basic files. @@ -1651,8 +1651,8 @@ Requires(post,postun): %{_bindir}/texhash Requires: %{name}-fonts-cs = %{epoch}:%{version}-%{release} Requires: %{name}-plain = %{epoch}:%{version}-%{release} -Obsoletes: tetex-cslatex Provides: tetex-cslatex +Obsoletes: tetex-cslatex %description cslatex CSLaTeX format basic files. @@ -1695,8 +1695,8 @@ Group: Applications/Publishing/TeX Requires(post,postun): %{_bindir}/texhash Requires: %{name}-plain = %{epoch}:%{version}-%{release} -Obsoletes: tetex-etex Obsoletes: tetex-eplain +Obsoletes: tetex-etex %description eplain EPlain format basic files. @@ -2871,11 +2871,9 @@ Summary(hu.UTF-8): Matematikai csomagok Group: Applications/Publishing/TeX Requires(post,postun): %{_bindir}/texhash -Requires: %{name}-latex = %{epoch}:%{version}-%{release} -# gnuplottex needs gnuplot -Requires: gnuplot Requires: %{name}-fonts-bbm = %{epoch}:%{version}-%{release} Requires: %{name}-fonts-stmaryrd = %{epoch}:%{version}-%{release} +Requires: %{name}-latex = %{epoch}:%{version}-%{release} Requires: %{name}-latex-ams = %{epoch}:%{version}-%{release} Requires: %{name}-latex-carlisle = %{epoch}:%{version}-%{release} Requires: %{name}-latex-psnfss = %{epoch}:%{version}-%{release} @@ -2884,6 +2882,8 @@ Requires: %{name}-tex-pstricks = %{epoch}:%{version}-%{release} Requires: %{name}-tex-xkeyval = %{epoch}:%{version}-%{release} Requires: %{name}-tex-xypic = %{epoch}:%{version}-%{release} +# gnuplottex needs gnuplot +Requires: gnuplot %description latex-math This package contains: @@ -4239,8 +4239,8 @@ Group: Applications/Publishing/TeX Requires(post,postun): %{_bindir}/texhash Requires: %{name} = %{epoch}:%{version}-%{release} -Obsoletes: tetex-tex-spanishb Obsoletes: tetex-tex-spanish +Obsoletes: tetex-tex-spanishb %description tex-spanish Various TeX related files for typesetting documents written in @@ -4904,10 +4904,10 @@ Obsoletes: tetex-fonts-cbgreek Obsoletes: tetex-fonts-dstroke Obsoletes: tetex-fonts-pazo -Obsoletes: tetex-qfonts Obsoletes: tetex-fonts-type1-dstroke Obsoletes: tetex-fonts-type1-qfonts Obsoletes: tetex-fonts-type1-tt2001 +Obsoletes: tetex-qfonts %description fonts-other Other fonts. @@ -5563,9 +5563,9 @@ %package xmltex Summary: TeX package for processing XML files Group: Applications/Publishing/TeX -Obsoletes: xmltex -Provides: xmltex Requires(post,postun): /usr/bin/texhash +Provides: xmltex +Obsoletes: xmltex %description xmltex XMLTeX is a non-validating, namespace-aware XML parser written in TeX. @@ -5886,7 +5886,7 @@ xetex \ xelatex \ xmltex; do - fmtutil --fmtdir $RPM_BUILD_ROOT%{fmtdir} --byfmt=${format} + fmtutil --fmtdir $RPM_BUILD_ROOT%{fmtdir} --byfmt=${format} done # We don't need the log files rm -f $(find $RPM_BUILD_ROOT%{fmtdir} -name "*.log") @@ -13901,6 +13901,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.248 2009/04/28 21:18:00 glen +- no macros in Obsoletes, adapter + Revision 1.247 2009/04/28 18:55:32 uzsolt - Provides psutils instead of epsutils ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/texlive/texlive.spec?r1=1.247&r2=1.248&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
