diff --git a/texlive.spec b/texlive.spec index 3599d17..b31351a 100644 --- a/texlive.spec +++ b/texlive.spec @@ -1,6 +1,6 @@ %global source_date 20130427_r30134 %global tl_version 2012 -%global tl_rel 21 +%global tl_rel 22 %global tl_release %{tl_rel}.%{source_date}%{?dist} %global tl_noarch_release %{tl_rel}%{?dist} %global source_name texlive-%{source_date}-source @@ -169125,6 +169125,8 @@ Provides: tex(musixcpt.sty) = %{tl_version} Provides: tex(musixcrd.sty) = %{tl_version} Provides: tex(musixltx.tex) = %{tl_version} Provides: tex(musixtex.sty) = %{tl_version} +Provides: tex-musixtex = %{tl_version} +Obsoletes: tex-musixtex < %{tl_version} %description musixtex MusiXTeX provides a set of macros, based on the earlier @@ -169170,6 +169172,8 @@ Release: %{tl_noarch_release} Provides: tex-musixtex-doc BuildArch: noarch AutoReqProv: No +Provides: tex-musixtex-doc = %{tl_version} +Obsoletes: tex-musixtex-doc < %{tl_version} %description musixtex-doc Documentation for musixtex @@ -169345,6 +169349,8 @@ Provides: tex(xslup20.pfb) = %{tl_version} Provides: tex(xslz20.pfb) = %{tl_version} Provides: tex(xslz20d.pfb) = %{tl_version} Provides: tex(xtie20.pfb) = %{tl_version} +Provides: ctan-musixtex-fonts = %{tl_version} +Obsoletes: ctan-musixtex-fonts = %{tl_version} %description musixtex-fnts These are fonts for use with MusixTeX; they are provided both @@ -318014,6 +318020,9 @@ fi %{_libdir}/*.so %changelog +* Mon Apr 29 2013 Tom Callaway - 2012-22-20130427 +- obsolete/provide ctan-musixtex-fonts and tex-musixtex + * Sat Apr 27 2013 Jindrich Novy - 2012-21-20130427 - add missing shebang to context script - mark language.dat as config file (#929367) diff --git a/texlive.spec.template b/texlive.spec.template index 8a43a44..87da8b0 100644 --- a/texlive.spec.template +++ b/texlive.spec.template @@ -1,6 +1,6 @@ %global source_date 20130427_r30134 %global tl_version 2012 -%global tl_rel 21 +%global tl_rel 22 %global tl_release %{tl_rel}.%{source_date}%{?dist} %global tl_noarch_release %{tl_rel}%{?dist} %global source_name texlive-%{source_date}-source @@ -368,6 +368,9 @@ fi %{_libdir}/*.so %changelog +* Mon Apr 29 2013 Tom Callaway - 2012-22-20130427 +- obsolete/provide ctan-musixtex-fonts and tex-musixtex + * Sat Apr 27 2013 Jindrich Novy - 2012-21-20130427 - add missing shebang to context script - mark language.dat as config file (#929367) diff --git a/tl2rpm.c b/tl2rpm.c index c179fba..03bb6f6 100644 --- a/tl2rpm.c +++ b/tl2rpm.c @@ -1500,6 +1500,18 @@ void solve(char *name) { if ( !strcmp(name, "pdfjam") ) { /* rhbz#913678 */ fprintf(fpack, "Obsoletes: pdfbook < %%{tl_version}1212\n"); } + if ( !strcmp(name, "musixtex-fnts") ) { + fprintf(fpack, "Provides: ctan-musixtex-fonts = %%{tl_version}\n"); + fprintf(fpack, "Obsoletes: ctan-musixtex-fonts < %%{tl_version}\n"); + } + if ( !strcmp(name, "musixtex-doc") ) { + fprintf(fpack, "Provides: tex-musixtex-doc = %%{tl_version}\n"); + fprintf(fpack, "Obsoletes: tex-musixtex-doc < %%{tl_version}\n"); + } + if ( !strcmp(name, "musixtex") ) { + fprintf(fpack, "Provides: tex-musixtex = %%{tl_version}\n"); + fprintf(fpack, "Obsoletes: tex-musixtex < %%{tl_version}\n"); + } /* description */ #ifndef SRPMS fprintf(fpack, "\n%%description %s\n", name);