From f144dd9cb302742c3d6efba700a62d7610f4c9c3 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Wed, 23 Jul 2014 06:40:00 +0100 Subject: [PATCH] Update to TeX Live 2014 - fix dependencies --- texlive.spec | 210 ++++++++++++------------------------------ texlive.spec.template | 8 +- tl2rpm.c | 4 +- 3 files changed, 67 insertions(+), 155 deletions(-) diff --git a/texlive.spec b/texlive.spec index b60573d..6b56816 100644 --- a/texlive.spec +++ b/texlive.spec @@ -1,6 +1,6 @@ %global source_date 20140525_r34255 %global tl_version 2014 -%global tl_rel 0.1 +%global tl_rel 1 %global tl_release %{tl_rel}.%{source_date}%{?dist} %global tl_noarch_release %{tl_rel}%{?dist} %global source_name texlive-%{source_date}-source @@ -23,7 +23,7 @@ Name: texlive Version: %{tl_version} Release: %{tl_release} -Epoch: 3 +Epoch: 4 Summary: TeX formatting system Group: Applications/Publishing License: Artistic 2.0 and GPLv2 and GPLv2+ and LGPLv2+ and LPPL and MIT and Public Domain and UCD and Utopia @@ -7223,7 +7223,6 @@ Summary: Binaries for accfonts Version: svn12688.0 Requires: texlive-base Requires: texlive-accfonts -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -7870,7 +7869,6 @@ Summary: Binaries for adhocfilelist Version: svn28038.0 Requires: texlive-base Requires: texlive-adhocfilelist -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -8471,8 +8469,8 @@ Summary: Binaries for afm2pl Version: svn30088.0 Requires: texlive-base Requires: texlive-afm2pl -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description afm2pl-bin Binaries for afm2pl @@ -11684,8 +11682,8 @@ Summary: Binaries for luatex Version: svn31084.0 Requires: texlive-base Requires: texlive-luatex -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description luatex-bin Binaries for luatex @@ -11836,8 +11834,8 @@ Documentation for kpathsea Summary: Binaries for kpathsea Version: svn30088.0 Requires: texlive-kpathsea -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description kpathsea-bin Binaries for kpathsea @@ -11847,8 +11845,8 @@ Summary: Binaries for pdftex Version: svn30845.0 Requires: texlive-base Requires: texlive-pdftex -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description pdftex-bin Binaries for pdftex @@ -12120,8 +12118,8 @@ Summary: Binaries for aleph Version: svn30088.0 Requires: texlive-base Requires: texlive-aleph -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description aleph-bin Binaries for aleph @@ -13665,8 +13663,8 @@ Summary: Binaries for tex Version: svn30088.0 Requires: texlive-base Requires: texlive-tex -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description tex-bin Binaries for tex @@ -13676,7 +13674,6 @@ Summary: Binaries for amstex Version: svn3006.0 Requires: texlive-base Requires: texlive-amstex -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -16180,7 +16177,6 @@ Summary: Binaries for arara Version: svn29036.0 Requires: texlive-base Requires: texlive-arara -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -19045,7 +19041,6 @@ Summary: Binaries for authorindex Version: svn18790.0 Requires: texlive-base Requires: texlive-authorindex -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -19626,7 +19621,6 @@ Summary: Binaries for a2ping Version: svn27321.0 Requires: texlive-base Requires: texlive-a2ping -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -26772,7 +26766,6 @@ Summary: Binaries for bibexport Version: svn16219.0 Requires: texlive-base Requires: texlive-bibexport -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -28904,8 +28897,8 @@ Summary: Binaries for bibtex Version: svn30088.0 Requires: texlive-base Requires: texlive-bibtex -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description bibtex-bin Binaries for bibtex @@ -28940,8 +28933,8 @@ Summary: Binaries for bibtexu Version: svn30088.0 Requires: texlive-base Requires: texlive-bibtexu -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description bibtexu-bin Binaries for bibtexu @@ -29003,8 +28996,8 @@ Summary: Binaries for bibtex8 Version: svn30088.0 Requires: texlive-base Requires: texlive-bibtex8 -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description bibtex8-bin Binaries for bibtex8 @@ -32132,7 +32125,6 @@ Summary: Binaries for bundledoc Version: svn17794.0 Requires: texlive-base Requires: texlive-bundledoc -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -33126,7 +33118,6 @@ Summary: Binaries for cachepic Version: svn15543.0 Requires: texlive-base Requires: texlive-cachepic -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -44144,8 +44135,8 @@ Summary: Binaries for cjkutils Version: svn30088.0 Requires: texlive-base Requires: texlive-cjkutils -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description cjkutils-bin Binaries for cjkutils @@ -47959,8 +47950,8 @@ Summary: Binaries for texlive.infra Version: svn29741.0 Requires: texlive-base Requires: texlive-texlive.infra -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description texlive.infra-bin Binaries for texlive.infra @@ -48106,10 +48097,10 @@ Summary: Binaries for dvipdfmx Version: svn30845.0 Requires: texlive-base Requires: texlive-dvipdfmx -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Provides: dvipdfmx = %{tl_version}, dvipdfm = %{tl_version}, texlive-dvipdfm-bin = 3:%{tl_version} Obsoletes: dvipdfmx < %{tl_version}, dvipdfm < %{tl_version}, texlive-dvipdfm-bin < 3:%{tl_version} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description dvipdfmx-bin Binaries for dvipdfmx @@ -48234,8 +48225,8 @@ Summary: Binaries for dvips Version: svn30088.0 Requires: texlive-base Requires: texlive-dvips -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description dvips-bin Binaries for dvips @@ -48482,8 +48473,8 @@ Summary: Binaries for gsftopk Version: svn30088.0 Requires: texlive-base Requires: texlive-gsftopk -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description gsftopk-bin Binaries for gsftopk @@ -49086,8 +49077,8 @@ Summary: Binaries for makeindex Version: svn30088.0 Requires: texlive-base Requires: texlive-makeindex -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description makeindex-bin Binaries for makeindex @@ -49151,8 +49142,8 @@ Summary: Binaries for metafont Version: svn30088.0 Requires: texlive-base Requires: texlive-metafont -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description metafont-bin Binaries for metafont @@ -49275,8 +49266,8 @@ Summary: Binaries for mfware Version: svn30088.0 Requires: texlive-base Requires: texlive-mfware -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description mfware-bin Binaries for mfware @@ -49369,7 +49360,6 @@ Summary: Binaries for tetex Version: svn29741.0 Requires: texlive-base Requires: texlive-tetex -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -49417,7 +49407,6 @@ Summary: Binaries for texconfig Version: svn29741.0 Requires: texlive-base Requires: texlive-texconfig -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -49525,7 +49514,6 @@ Summary: Binaries for texlive-scripts Version: svn29741.0 Requires: texlive-base Requires: texlive-texlive-scripts -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -49578,10 +49566,10 @@ Summary: Binaries for xdvi Version: svn30088.0 Requires: texlive-base Requires: texlive-xdvi -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Provides: xdvi = %{tl_version}, xdvik = %{tl_version}, tetex-xdvi = 3.1-99 Obsoletes: xdvi < %{tl_version}, xdvik < %{tl_version}, tetex-xdvi < 3.1-99 Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description xdvi-bin Binaries for xdvi @@ -50185,7 +50173,6 @@ Summary: Binaries for latex-bin Version: svn14050.0 Requires: texlive-base Requires: texlive-latex-bin -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -50373,7 +50360,6 @@ Summary: Binaries for mptopdf Version: svn18674.0 Requires: texlive-base Requires: texlive-mptopdf -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -52633,7 +52619,6 @@ Summary: Binaries for listbib Version: svn26126.0 Requires: texlive-base Requires: texlive-listbib -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -52864,7 +52849,6 @@ Summary: Binaries for multibibliography Version: svn30534.0 Requires: texlive-base Requires: texlive-multibibliography -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -53492,7 +53476,6 @@ Summary: Binaries for urlbst Version: svn23262.0 Requires: texlive-base Requires: texlive-urlbst -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -53792,8 +53775,8 @@ Summary: Binaries for chktex Version: svn30088.0 Requires: texlive-base Requires: texlive-chktex -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description chktex-bin Binaries for chktex @@ -53858,7 +53841,6 @@ Summary: Binaries for ctanify Version: svn24061.0 Requires: texlive-base Requires: texlive-ctanify -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -53920,7 +53902,6 @@ Summary: Binaries for ctanupload Version: svn23866.0 Requires: texlive-base Requires: texlive-ctanupload -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -53970,8 +53951,8 @@ Summary: Binaries for ctie Version: svn30088.0 Requires: texlive-base Requires: texlive-ctie -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description ctie-bin Binaries for ctie @@ -54038,8 +54019,8 @@ Summary: Binaries for cweb Version: svn30088.0 Requires: texlive-base Requires: texlive-cweb -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description cweb-bin Binaries for cweb @@ -54103,7 +54084,6 @@ Summary: Binaries for de-macro Version: svn17399.0 Requires: texlive-base Requires: texlive-de-macro -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -54157,8 +54137,8 @@ Summary: Binaries for detex Version: svn30088.0 Requires: texlive-base Requires: texlive-detex -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description detex-bin Binaries for detex @@ -54210,8 +54190,8 @@ Summary: Binaries for dtl Version: svn30088.0 Requires: texlive-base Requires: texlive-dtl -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description dtl-bin Binaries for dtl @@ -54271,7 +54251,6 @@ Summary: Binaries for dtxgen Version: svn29031.0 Requires: texlive-base Requires: texlive-dtxgen -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -54322,8 +54301,8 @@ Summary: Binaries for dvi2tty Version: svn30376.0 Requires: texlive-base Requires: texlive-dvi2tty -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description dvi2tty-bin Binaries for dvi2tty @@ -54373,7 +54352,6 @@ Summary: Binaries for dviasm Version: svn8329.0 Requires: texlive-base Requires: texlive-dviasm -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -54425,8 +54403,8 @@ Summary: Binaries for dvicopy Version: svn30088.0 Requires: texlive-base Requires: texlive-dvicopy -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description dvicopy-bin Binaries for dvicopy @@ -54475,8 +54453,8 @@ Summary: Binaries for dvidvi Version: svn30088.0 Requires: texlive-base Requires: texlive-dvidvi -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description dvidvi-bin Binaries for dvidvi @@ -54527,8 +54505,8 @@ Summary: Binaries for dviljk Version: svn30088.0 Requires: texlive-base Requires: texlive-dviljk -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description dviljk-bin Binaries for dviljk @@ -54606,10 +54584,10 @@ Summary: Binaries for dvipng Version: svn30845.0 Requires: texlive-base Requires: texlive-dvipng -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Provides: dvipng = %{tl_version} Obsoletes: dvipng < %{tl_version} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description dvipng-bin Binaries for dvipng @@ -54654,8 +54632,8 @@ Summary: Binaries for dvipos Version: svn30088.0 Requires: texlive-base Requires: texlive-dvipos -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description dvipos-bin Binaries for dvipos @@ -54713,10 +54691,10 @@ Summary: Binaries for dvisvgm Version: svn30613.0 Requires: texlive-base Requires: texlive-dvisvgm -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Provides: dvisvgm = %{tl_version} Obsoletes: dvisvgm < %{tl_version} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description dvisvgm-bin Binaries for dvisvgm @@ -54777,7 +54755,6 @@ Summary: Binaries for findhyph Version: svn14758.0 Requires: texlive-base Requires: texlive-findhyph -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -54839,7 +54816,6 @@ Summary: Binaries for fragmaster Version: svn13663.0 Requires: texlive-base Requires: texlive-fragmaster -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -54987,8 +54963,8 @@ Summary: Binaries for lacheck Version: svn30088.0 Requires: texlive-base Requires: texlive-lacheck -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description lacheck-bin Binaries for lacheck @@ -55049,7 +55025,6 @@ Summary: Binaries for latex-git-log Version: svn30983.0 Requires: texlive-base Requires: texlive-latex-git-log -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -55124,7 +55099,6 @@ Summary: Binaries for latex2man Version: svn13663.0 Requires: texlive-base Requires: texlive-latex2man -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -55194,7 +55168,6 @@ Summary: Binaries for latexdiff Version: svn16420.0 Requires: texlive-base Requires: texlive-latexdiff -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -55258,7 +55231,6 @@ Summary: Binaries for latexfileversion Version: svn25012.0 Requires: texlive-base Requires: texlive-latexfileversion -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -55320,7 +55292,6 @@ Summary: Binaries for latexpand Version: svn27025.0 Requires: texlive-base Requires: texlive-latexpand -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -55382,7 +55353,6 @@ Summary: Binaries for latexindent Version: svn32150.0 Requires: texlive-base Requires: texlive-latexindent -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -55448,7 +55418,6 @@ Summary: Binaries for ltxfileinfo Version: svn29005.0 Requires: texlive-base Requires: texlive-ltxfileinfo -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -55511,7 +55480,6 @@ Summary: Binaries for ltximg Version: svn32346.0 Requires: texlive-base Requires: texlive-ltximg -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -55580,7 +55548,6 @@ Summary: Binaries for listings-ext Version: svn15093.0 Requires: texlive-base Requires: texlive-listings-ext -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -55645,7 +55612,6 @@ Summary: Binaries for match_parens Version: svn23500.0 Requires: texlive-base Requires: texlive-match_parens -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -55711,7 +55677,6 @@ Summary: Binaries for mkjobtexmf Version: svn8457.0 Requires: texlive-base Requires: texlive-mkjobtexmf -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -55764,8 +55729,8 @@ Summary: Binaries for patgen Version: svn30088.0 Requires: texlive-base Requires: texlive-patgen -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description patgen-bin Binaries for patgen @@ -55825,7 +55790,6 @@ Summary: Binaries for pdfcrop Version: svn14387.0 Requires: texlive-base Requires: texlive-pdfcrop -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Requires: ghostscript-devel Release: %{tl_release} BuildArch: noarch @@ -55892,7 +55856,6 @@ Summary: Binaries for pdfjam Version: svn17868.0 Requires: texlive-base Requires: texlive-pdfjam -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -55946,8 +55909,8 @@ Summary: Binaries for pdftools Version: svn31666.0 Requires: texlive-base Requires: texlive-pdftools -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description pdftools-bin Binaries for pdftools @@ -56018,7 +55981,6 @@ Summary: Binaries for pfarrei Version: svn29348.0 Requires: texlive-base Requires: texlive-pfarrei -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -56080,7 +56042,6 @@ Summary: Binaries for pkfix Version: svn13364.0 Requires: texlive-base Requires: texlive-pkfix -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -56151,7 +56112,6 @@ Summary: Binaries for pkfix-helper Version: svn13663.0 Requires: texlive-base Requires: texlive-pkfix-helper -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -56219,7 +56179,6 @@ Summary: Binaries for purifyeps Version: svn13663.0 Requires: texlive-base Requires: texlive-purifyeps -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -56303,7 +56262,6 @@ Summary: Binaries for pythontex Version: svn31638.0 Requires: texlive-base Requires: texlive-pythontex -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -56360,8 +56318,8 @@ Summary: Binaries for seetexk Version: svn30088.0 Requires: texlive-base Requires: texlive-seetexk -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description seetexk-bin Binaries for seetexk @@ -56431,7 +56389,6 @@ Summary: Binaries for sty2dtx Version: svn21215.0 Requires: texlive-base Requires: texlive-sty2dtx -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -56478,8 +56435,8 @@ Summary: Binaries for synctex Version: svn30088.0 Requires: texlive-base Requires: texlive-synctex -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description synctex-bin Binaries for synctex @@ -56541,7 +56498,6 @@ Summary: Binaries for texcount Version: svn13013.0 Requires: texlive-base Requires: texlive-texcount -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -56616,7 +56572,6 @@ Summary: Binaries for texdef Version: svn21802.0 Requires: texlive-base Requires: texlive-texdef -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -56669,7 +56624,6 @@ Summary: Binaries for texdirflatten Version: svn12782.0 Requires: texlive-base Requires: texlive-texdirflatten -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -56738,7 +56692,6 @@ Summary: Binaries for texdoc Version: svn29741.0 Requires: texlive-base Requires: texlive-texdoc -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -56801,7 +56754,6 @@ Summary: Binaries for texfot Version: svn33155.0 Requires: texlive-base Requires: texlive-texfot -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -56869,7 +56821,6 @@ Summary: Binaries for texliveonfly Version: svn24062.0 Requires: texlive-base Requires: texlive-texliveonfly -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -56930,7 +56881,6 @@ Summary: Binaries for texloganalyser Version: svn13663.0 Requires: texlive-base Requires: texlive-texloganalyser -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -56984,8 +56934,8 @@ Summary: Binaries for texware Version: svn30088.0 Requires: texlive-base Requires: texlive-texware -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description texware-bin Binaries for texware @@ -57036,8 +56986,8 @@ Summary: Binaries for tie Version: svn30088.0 Requires: texlive-base Requires: texlive-tie -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description tie-bin Binaries for tie @@ -57096,7 +57046,6 @@ Summary: Binaries for tpic2pdftex Version: svn29741.0 Requires: texlive-base Requires: texlive-tpic2pdftex -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -57160,7 +57109,6 @@ Summary: Binaries for typeoutfileinfo Version: svn25648.0 Requires: texlive-base Requires: texlive-typeoutfileinfo -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -57213,8 +57161,8 @@ Summary: Binaries for web Version: svn30088.0 Requires: texlive-base Requires: texlive-web -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description web-bin Binaries for web @@ -57636,8 +57584,8 @@ Summary: Binaries for metapost Version: svn30845.0 Requires: texlive-base Requires: texlive-metapost -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description metapost-bin Binaries for metapost @@ -57744,11 +57692,11 @@ Summary: Binaries for xetex Version: svn30845.0 Requires: texlive-base Requires: texlive-xetex -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Requires: teckit Provides: xdvipdfmx = %{version}-%{release} Obsoletes: xdvipdfmx < %{version}-%{release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description xetex-bin Binaries for xetex @@ -58819,7 +58767,6 @@ Summary: Binaries for context Version: svn29741.0 Requires: texlive-base Requires: texlive-context -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -95592,7 +95539,6 @@ Summary: Binaries for dosepsbin Version: svn24759.0 Requires: texlive-base Requires: texlive-dosepsbin -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -95663,7 +95609,6 @@ Summary: Binaries for epstopdf Version: svn18336.0 Requires: texlive-base Requires: texlive-epstopdf -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -95710,8 +95655,8 @@ Summary: Binaries for fontware Version: svn30088.0 Requires: texlive-base Requires: texlive-fontware -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description fontware-bin Binaries for fontware @@ -95777,10 +95722,10 @@ Summary: Binaries for lcdftypetools Version: svn30088.0 Requires: texlive-base Requires: texlive-lcdftypetools -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Provides: lcdf-typetools = %{tl_version} Obsoletes: lcdf-typetools < %{tl_version} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description lcdftypetools-bin Binaries for lcdftypetools @@ -95830,8 +95775,8 @@ Summary: Binaries for ps2pkm Version: svn30088.0 Requires: texlive-base Requires: texlive-ps2pkm -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description ps2pkm-bin Binaries for ps2pkm @@ -95895,10 +95840,10 @@ Summary: Binaries for pstools Version: svn30088.0 Requires: texlive-base Requires: texlive-pstools -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Provides: ps2eps = %{tl_version} Obsoletes: ps2eps < %{tl_version} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description pstools-bin Binaries for pstools @@ -96024,7 +95969,6 @@ Summary: Binaries for fontinst Version: svn29741.0 Requires: texlive-base Requires: texlive-fontinst -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -96094,7 +96038,6 @@ Summary: Binaries for fontools Version: svn25997.0 Requires: texlive-base Requires: texlive-fontools -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -96168,7 +96111,6 @@ Summary: Binaries for mf2pt1 Version: svn23406.0 Requires: texlive-base Requires: texlive-mf2pt1 -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -96228,8 +96170,8 @@ Summary: Binaries for ttfutils Version: svn30088.0 Requires: texlive-base Requires: texlive-ttfutils -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description ttfutils-bin Binaries for ttfutils @@ -96383,7 +96325,6 @@ Summary: Binaries for eplain Version: svn3006.0 Requires: texlive-base Requires: texlive-eplain -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -96460,7 +96401,6 @@ Summary: Binaries for mltex Version: svn3006.0 Requires: texlive-base Requires: texlive-mltex -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -96667,7 +96607,6 @@ Summary: Binaries for texsis Version: svn3006.0 Requires: texlive-base Requires: texlive-texsis -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -97860,7 +97799,6 @@ Summary: Binaries for rubik Version: svn32919.0 Requires: texlive-base Requires: texlive-rubik -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -100772,7 +100710,6 @@ Summary: Binaries for jadetex Version: svn3006.0 Requires: texlive-base Requires: texlive-jadetex -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -100860,7 +100797,6 @@ Provides: tex(m-tex4ht.tex) = %{tl_version} Provides: tex(tex4ht.sty) = %{tl_version} Provides: tetex-tex4ht = %{tl_version} Obsoletes: tetex-tex4ht < %{tl_version} -Conflicts: ht %description tex4ht A converter from TeX and LaTeX to SGML-based formats such as @@ -100914,8 +100850,8 @@ Summary: Binaries for tex4ht Version: svn30088.0 Requires: texlive-base Requires: texlive-tex4ht -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description tex4ht-bin Binaries for tex4ht @@ -100996,7 +100932,6 @@ Summary: Binaries for xmltex Version: svn3006.0 Requires: texlive-base Requires: texlive-xmltex -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Provides: xmltex = %{tl_version}0101 Obsoletes: xmltex < %{tl_version}0101 Release: %{tl_release} @@ -104586,7 +104521,6 @@ Summary: Binaries for convbkmk Version: svn30408.0 Requires: texlive-base Requires: texlive-convbkmk -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -108204,7 +108138,6 @@ Summary: Binaries for jfontmaps Version: svn29848.0 Requires: texlive-base Requires: texlive-jfontmaps -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -108663,7 +108596,6 @@ Summary: Binaries for kotex-utils Version: svn32101.0 Requires: texlive-base Requires: texlive-kotex-utils -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -110443,8 +110375,8 @@ Summary: Binaries for ptex Version: svn30376.0 Requires: texlive-base Requires: texlive-ptex -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description ptex-bin Binaries for ptex @@ -110506,7 +110438,6 @@ Summary: Binaries for ptex2pdf Version: svn29335.0 Requires: texlive-base Requires: texlive-ptex2pdf -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -110930,8 +110861,8 @@ Summary: Binaries for uptex Version: svn30412.0 Requires: texlive-base Requires: texlive-uptex -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description uptex-bin Binaries for uptex @@ -116560,7 +116491,6 @@ Summary: Binaries for cyrillic-bin Version: svn29741.0 Requires: texlive-base Requires: texlive-cyrillic-bin -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -118640,7 +118570,6 @@ Summary: Binaries for cslatex Version: svn3006.0 Requires: texlive-base Requires: texlive-cslatex -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -118749,7 +118678,6 @@ Summary: Binaries for csplain Version: svn3006.0 Requires: texlive-base Requires: texlive-csplain -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -118916,8 +118844,8 @@ Summary: Binaries for vlna Version: svn30088.0 Requires: texlive-base Requires: texlive-vlna -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description vlna-bin Binaries for vlna @@ -124164,7 +124092,6 @@ Summary: Binaries for mkgrkindex Version: svn14428.0 Requires: texlive-base Requires: texlive-mkgrkindex -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -124399,8 +124326,8 @@ Summary: Binaries for devnag Version: svn30088.0 Requires: texlive-base Requires: texlive-devnag -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description devnag-bin Binaries for devnag @@ -124461,7 +124388,6 @@ Summary: Binaries for ebong Version: svn21000.0 Requires: texlive-base Requires: texlive-ebong -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -126867,7 +126793,6 @@ Summary: Binaries for mex Version: svn3006.0 Requires: texlive-base Requires: texlive-mex -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -131450,7 +131375,6 @@ Summary: Binaries for thumbpdf Version: svn6898.0 Requires: texlive-base Requires: texlive-thumbpdf -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -132491,7 +132415,6 @@ Summary: Binaries for epspdf Version: svn29050.0 Requires: texlive-base Requires: texlive-epspdf -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -132721,7 +132644,6 @@ Summary: Binaries for fig4latex Version: svn14752.0 Requires: texlive-base Requires: texlive-fig4latex -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -133780,7 +133702,6 @@ Summary: Binaries for mathspic Version: svn23661.0 Requires: texlive-base Requires: texlive-mathspic -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -146844,7 +146765,6 @@ Summary: Binaries for exceltex Version: svn25860.0 Requires: texlive-base Requires: texlive-exceltex -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -151240,7 +151160,6 @@ Summary: Binaries for glossaries Version: svn6881.0 Requires: texlive-base Requires: texlive-glossaries -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -165607,7 +165526,6 @@ Summary: Binaries for pax Version: svn10843.0 Requires: texlive-base Requires: texlive-pax -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -166434,7 +166352,6 @@ Summary: Binaries for perltex Version: svn16181.0 Requires: texlive-base Requires: texlive-perltex -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -168037,7 +167954,6 @@ Summary: Binaries for pst-pdf Version: svn7838.0 Requires: texlive-base Requires: texlive-pst-pdf -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -173696,7 +173612,6 @@ Summary: Binaries for splitindex Version: svn29688.0 Requires: texlive-base Requires: texlive-splitindex -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -175479,7 +175394,6 @@ Summary: Binaries for svn-multi Version: svn13663.0 Requires: texlive-base Requires: texlive-svn-multi -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -181602,7 +181516,6 @@ Summary: Binaries for vpe Version: svn6897.0 Requires: texlive-base Requires: texlive-vpe -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -183642,7 +183555,6 @@ Summary: Binaries for checkcites Version: svn25623.0 Requires: texlive-base Requires: texlive-checkcites -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -183988,7 +183900,6 @@ Summary: Binaries for lua2dox Version: svn29053.0 Requires: texlive-base Requires: texlive-lua2dox -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -184500,7 +184411,6 @@ Summary: Binaries for luaotfload Version: svn30313.0 Requires: texlive-base Requires: texlive-luaotfload -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -189415,7 +189325,6 @@ Summary: Binaries for lilyglyphs Version: svn31696.0 Requires: texlive-base Requires: texlive-lilyglyphs -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -189480,8 +189389,8 @@ Summary: Binaries for m-tx Version: svn30088.0 Requires: texlive-base Requires: texlive-m-tx -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description m-tx-bin Binaries for m-tx @@ -189648,7 +189557,6 @@ Summary: Binaries for musixtex Version: svn22187.0 Requires: texlive-base Requires: texlive-musixtex -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -189921,8 +189829,8 @@ Summary: Binaries for pmx Version: svn30088.0 Requires: texlive-base Requires: texlive-pmx -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description pmx-bin Binaries for pmx @@ -189986,7 +189894,6 @@ Summary: Binaries for pmxchords Version: svn32405.0 Requires: texlive-base Requires: texlive-pmxchords -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -190242,8 +190149,8 @@ Summary: Binaries for omegaware Version: svn30088.0 Requires: texlive-base Requires: texlive-omegaware -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} +Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version} %description omegaware-bin Binaries for omegaware @@ -191761,7 +191668,6 @@ Summary: Binaries for pedigree-perl Version: svn25962.0 Requires: texlive-base Requires: texlive-pedigree-perl -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -196083,7 +195989,6 @@ Summary: Binaries for pst2pdf Version: svn29333.0 Requires: texlive-base Requires: texlive-pst2pdf -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -205127,7 +205032,6 @@ Summary: Binaries for ulqda Version: svn13663.0 Requires: texlive-base Requires: texlive-ulqda -Requires: texlive-kpathsea-lib = %{epoch}:%{tl_version}-%{tl_release} Release: %{tl_release} BuildArch: noarch @@ -355503,6 +355407,10 @@ fi %{_libdir}/*.so %changelog +* Tue Jul 22 2014 Jindrich Novy - 2014-1-20140525 +- Tex Live 2014 is out +- fix package dependencies to make update path smoother + * Sun Jun 8 2014 Jindrich Novy - 2014-0.1-20140525 - update to TeX Live 2014 release candidate - conflict with ht package (#959696) diff --git a/texlive.spec.template b/texlive.spec.template index 1f15b9c..2e41d0e 100644 --- a/texlive.spec.template +++ b/texlive.spec.template @@ -1,6 +1,6 @@ %global source_date 20140525_r34255 %global tl_version 2014 -%global tl_rel 0.1 +%global tl_rel 1 %global tl_release %{tl_rel}.%{source_date}%{?dist} %global tl_noarch_release %{tl_rel}%{?dist} %global source_name texlive-%{source_date}-source @@ -23,7 +23,7 @@ Name: texlive Version: %{tl_version} Release: %{tl_release} -Epoch: 3 +Epoch: 4 Summary: TeX formatting system Group: Applications/Publishing License: Artistic 2.0 and GPLv2 and GPLv2+ and LGPLv2+ and LPPL and MIT and Public Domain and UCD and Utopia @@ -386,6 +386,10 @@ fi %{_libdir}/*.so %changelog +* Tue Jul 22 2014 Jindrich Novy - 2014-1-20140525 +- Tex Live 2014 is out +- fix package dependencies to make update path smoother + * Sun Jun 8 2014 Jindrich Novy - 2014-0.1-20140525 - update to TeX Live 2014 release candidate - conflict with ht package (#959696) diff --git a/tl2rpm.c b/tl2rpm.c index 7ee9fcb..6d5fc1b 100644 --- a/tl2rpm.c +++ b/tl2rpm.c @@ -1459,7 +1459,6 @@ void solve(char *name) { if ( !strcmp(name, "tex4ht") ) { fprintf(fpack, "Provides: tetex-tex4ht = %%{tl_version}\n"); fprintf(fpack, "Obsoletes: tetex-tex4ht < %%{tl_version}\n"); - fprintf(fpack, "Conflicts: ht\n"); } if ( !strcmp(name, "latex") ) { fprintf(fpack, "Provides: tetex-latex = 3.1-99, texlive-texmf-latex = %%{tl_version}\n"); @@ -2092,7 +2091,6 @@ void solve(char *name) { fprintf(fpack, "Version: %s\n", print_noarch_version(&pkg[i])); if ( strncmp(name, "kpathsea", 8) ) fprintf(fpack, "Requires: texlive-base\n"); if ( has_noarch_pkg ) fprintf(fpack, "Requires: texlive-%s\n", name); - fprintf(fpack, "Requires: texlive-kpathsea-lib = %%{epoch}:%%{tl_version}-%%{tl_release}\n"); if ( !strcmp(name, "xetex") ) { fprintf(fpack, "Requires: teckit\n"); fprintf(fpack, "Provides: xdvipdfmx = %%{version}-%%{release}\n"); @@ -2164,6 +2162,8 @@ void solve(char *name) { fprintf(fpack, "Release: %%{tl_release}\n"); if ( noarch ) { fprintf(fpack, "BuildArch: noarch\n"); + } else { + fprintf(fpack, "Requires: texlive-kpathsea-lib%{?_isa} = %%{epoch}:%%{tl_version}\n"); } } fprintf(fpack, "\n%%description %s-bin\n", name);