From f40d48a9097a48334f9162573a96208db102d1b6 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Tue, 4 Dec 2007 17:52:33 +0000 Subject: [PATCH] - try to obsolete tetex correctly --- texlive.spec | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/texlive.spec b/texlive.spec index 2b3d37d..37dc129 100644 --- a/texlive.spec +++ b/texlive.spec @@ -174,8 +174,8 @@ Requires: dvipdfmx # make sure fonts package installed before running post - since # fmtutil-sys is symlink to fmtutil Requires(post): %{_bindir}/fmtutil -Obsoletes: tetex <= 3.0 -Provides: tetex = 3.1 +Obsoletes: tetex < 3.0-99 +Provides: tetex = 3.0-99 %description TeXLive is an implementation of TeX for Linux or UNIX systems. TeX takes @@ -193,8 +193,8 @@ The TeX documentation is located in the texlive-doc package. %package afm Summary: A converter for PostScript(TM) font metric files, for use with TeX Group: Applications/Publishing -Obsoletes: tetex-afm <= 3.0 -Provides: tetex-afm = 3.1 +Obsoletes: tetex-afm < 3.0-99 +Provides: tetex-afm = 3.0-99 Requires: texlive-texmf-afm = %{version} Requires: texlive-texmf-errata = %{version} @@ -219,8 +219,8 @@ Summary: A DVI to PostScript converter for the TeX text formatting system Group: Applications/Publishing Requires: texlive-fonts = %{version}-%{release} Requires: psutils -Obsoletes: tetex-dvips <= 3.0 -Provides: tetex-dvips = 3.1 +Obsoletes: tetex-dvips < 3.0-99 +Provides: tetex-dvips = 3.0-99 Requires: texlive-texmf-dvips = %{version} Requires: texlive-texmf-errata = %{version} @@ -243,7 +243,7 @@ Requires: texlive-fonts = %{version}-%{release} # used to be in tetex, but has a separate upstream Requires: dvipng, dvipdfm # some dvi utilities used to be in tetex -Obsoletes: tetex <= 3.0 +Obsoletes: tetex < 3.0-99 %description dviutils The texlive-dviutils package includes a set of tools for working with dvi @@ -252,8 +252,8 @@ files. You only need this package if you plan to manipulate existing dvi files. %package fonts Summary: The font files for the TeX text formatting system Group: Applications/Publishing -Obsoletes: tetex-fonts <= 3.0 -Provides: tetex-fonts = 3.1 +Obsoletes: tetex-fonts < 3.0-99 +Provides: tetex-fonts = 3.0-99 # needed by allcm, allec, allneeded Requires: texlive-dvips = %{version}-%{release} Requires: texlive-texmf-fonts >= %{version} @@ -276,8 +276,8 @@ Requires: netpbm-progs # make sure main and fonts package installed before running post Requires(post): %{_bindir}/fmtutil %{_bindir}/fmtutil-sys BuildRequires: ghostscript netpbm-progs -Obsoletes: tetex-latex <= 3.0 -Provides: tetex-latex = 3.1 +Obsoletes: tetex-latex < 3.0-99 +Provides: tetex-latex = 3.0-99 Requires: texlive-texmf-latex = %{version} Requires: texlive-texmf-errata = %{version} @@ -292,7 +292,7 @@ The TeX documentation is located in the texlive-doc package. %package -n kpathsea Summary: Shared library needed by kpathsea and info files Group: Development/Libraries -Obsoletes: tetex-fonts <= 3.0 +Obsoletes: tetex-fonts < 3.0-99 %description -n kpathsea Shared library needed by kpathsea and info files. @@ -317,8 +317,8 @@ Requires(post): desktop-file-utils >= %{desktop_file_utils_version} Version: 22.84.12 #Url: http://xdvi.sourceforge.net/ #Source0: http://downloads.sourceforge.net/xdvi/xdvik-%{version}.tar.gz -Obsoletes: tetex-xdvi <= 3.0 -Provides: tetex-xdvi = 3.1 +Obsoletes: tetex-xdvi < 3.0-99 +Provides: tetex-xdvi = 3.0-99 #Provides: texlive-xdvi = %{version}-%{release} #Requires: texlive-texmf-errata = %{version} @@ -1339,6 +1339,9 @@ fi %{_texmf_main}/dvipdfm/ %changelog +* Tue Dec 04 2007 Jindrich Novy - 2007-3 +- try to obsolete tetex correctly + * Tue Dec 04 2007 Jindrich Novy - 2007-2 - avoid conflicts with tetex-doc package