diff --git a/.gitignore b/.gitignore index 1b5640f..2e17fd9 100644 --- a/.gitignore +++ b/.gitignore @@ -5503,4 +5503,4 @@ /12many.tar.xz /2up.doc.tar.xz /2up.tar.xz -/texlive-20121115_r28267-source.tar.xz +/texlive-20121120_r28314-source.tar.xz diff --git a/sources b/sources index 5af0e23..b998a2e 100644 --- a/sources +++ b/sources @@ -5503,4 +5503,4 @@ d9b1e9be31680dc5cc834046e294b2fa zwpagelayout.tar.xz 69ec0bac5187782998de2fcf864869ef 12many.tar.xz 847ee7231fe605d1f1283f40c2782709 2up.doc.tar.xz eadb8e1d91dfb3fdd2d50539a792123a 2up.tar.xz -3fad971264ef07c427305d1aacb97a2e texlive-20121115_r28267-source.tar.xz +5da998c90762b307af989e6cf65efa47 texlive-20121120_r28314-source.tar.xz diff --git a/texlive.spec b/texlive.spec index 66cc4c5..d5e2b2f 100644 --- a/texlive.spec +++ b/texlive.spec @@ -1,6 +1,6 @@ -%global source_date 20121115_r28267 +%global source_date 20121120_r28314 %global tl_version 2012 -%global tl_rel 8 +%global tl_rel 9 %global tl_release %{tl_rel}.%{source_date}%{?dist} %global tl_noarch_release %{tl_rel}%{?dist} %global source_name texlive-%{source_date}-source @@ -21,7 +21,7 @@ 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 URL: http://tug.org/texlive/ -BuildRequires: xz libXaw-devel ncurses-devel bison flex file perl-MD5 +BuildRequires: xz libXaw-devel ncurses-devel bison flex file BuildRequires: gd-devel teckit-devel freetype-devel t1lib-devel libpng-devel zlib-devel poppler-devel t1utils BuildRequires: zziplib-devel libicu-devel Requires: texlive-scheme-basic @@ -81412,8 +81412,8 @@ Summary: Binaries for xmltex Version: %{tl_version} Requires: texlive-base Requires: tex-xmltex -Provides: xmltex = %{tl_version} -Obsoletes: xmltex < %{tl_version} +Provides: xmltex = %{tl_version}0101 +Obsoletes: xmltex < %{tl_version}0101 Release: 0.svn3006.%{tl_release} BuildArch: noarch @@ -158120,6 +158120,8 @@ BuildArch: noarch AutoReqProv: No Requires: texlive-base Requires: texlive-kpathsea-bin, tex-kpathsea +Provides: metapost-metauml = %{tl_version} +Obsoletes: metapost-metauml < %{tl_version} %description metauml MetaUML is a MetaPost library for typesetting UML diagrams, @@ -180035,8 +180037,8 @@ popd # touch ghosts touch %{buildroot}%{_texdir}/texmf/ls-R +touch %{buildroot}%{_texdir}/texmf-local/ls-R touch %{buildroot}%{_texdir}/texmf-dist/ls-R -touch %{buildroot}%{_texdir}/../texmf/ls-R # configure ConTeXt for i in ctxtools luatools texexec texmfstart; do @@ -180055,10 +180057,6 @@ rm -rf %{_texmf_var}/* : %posttrans base -%{_bindir}/texhash 2> /dev/null -%{_bindir}/updmap-sys &> /dev/null -%{_bindir}/fmtutil-sys --all &> /dev/null -rm -rf %{_texmf_var}/web2c/* if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi @@ -187343,7 +187341,7 @@ fi %{_texdir}/licenses/* %attr(0644, root, root) %verify(not md5 size mtime) %ghost %{_texdir}/texmf/ls-R %attr(0644, root, root) %verify(not md5 size mtime) %ghost %{_texdir}/texmf-dist/ls-R -%attr(0644, root, root) %verify(not md5 size mtime) %ghost %{_texdir}/../texmf/ls-R +%attr(0644, root, root) %verify(not md5 size mtime) %ghost %{_texdir}/texmf-local/ls-R %{_texdir}/texlive.tlpdb %files aastex @@ -299989,6 +299987,12 @@ fi %{_libdir}/*.so %changelog +* Tue Nov 20 2012 Jindrich Novy 2012-9-20121120 +- obsolete metapost-metauml (#573863) +- remove BR perl-MD5 - not needed any more +- remove redundant posttrans executions in texlive-base (#865650) +- own ls-R in texmf-local directory + * Mon Nov 14 2012 Jindrich Novy 2012-8-20121115 - prevent sed from being verbose in install log when uninstalling - be sure the old /usr/share/texmf tree is indexed and searched by diff --git a/texlive.spec.template b/texlive.spec.template index 7178f24..9222f49 100644 --- a/texlive.spec.template +++ b/texlive.spec.template @@ -1,6 +1,6 @@ -%global source_date 20121115_r28267 +%global source_date 20121120_r28314 %global tl_version 2012 -%global tl_rel 8 +%global tl_rel 9 %global tl_release %{tl_rel}.%{source_date}%{?dist} %global tl_noarch_release %{tl_rel}%{?dist} %global source_name texlive-%{source_date}-source @@ -21,7 +21,7 @@ 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 URL: http://tug.org/texlive/ -BuildRequires: xz libXaw-devel ncurses-devel bison flex file perl-MD5 +BuildRequires: xz libXaw-devel ncurses-devel bison flex file BuildRequires: gd-devel teckit-devel freetype-devel t1lib-devel libpng-devel zlib-devel poppler-devel t1utils BuildRequires: zziplib-devel libicu-devel Requires: texlive-scheme-basic @@ -239,8 +239,8 @@ popd # touch ghosts touch %{buildroot}%{_texdir}/texmf/ls-R +touch %{buildroot}%{_texdir}/texmf-local/ls-R touch %{buildroot}%{_texdir}/texmf-dist/ls-R -touch %{buildroot}%{_texdir}/../texmf/ls-R # configure ConTeXt for i in ctxtools luatools texexec texmfstart; do @@ -259,10 +259,6 @@ rm -rf %{_texmf_var}/* : %posttrans base -%{_bindir}/texhash 2> /dev/null -%{_bindir}/updmap-sys &> /dev/null -%{_bindir}/fmtutil-sys --all &> /dev/null -rm -rf %{_texmf_var}/web2c/* if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then [ -x /sbin/restorecon ] && /sbin/restorecon -R %{_texmf_var}/ fi @@ -283,7 +279,7 @@ fi %{_texdir}/licenses/* %attr(0644, root, root) %verify(not md5 size mtime) %ghost %{_texdir}/texmf/ls-R %attr(0644, root, root) %verify(not md5 size mtime) %ghost %{_texdir}/texmf-dist/ls-R -%attr(0644, root, root) %verify(not md5 size mtime) %ghost %{_texdir}/../texmf/ls-R +%attr(0644, root, root) %verify(not md5 size mtime) %ghost %{_texdir}/texmf-local/ls-R %{_texdir}/texlive.tlpdb %include _files.spec @@ -303,6 +299,12 @@ fi %{_libdir}/*.so %changelog +* Tue Nov 20 2012 Jindrich Novy 2012-9-20121120 +- obsolete metapost-metauml (#573863) +- remove BR perl-MD5 - not needed any more +- remove redundant posttrans executions in texlive-base (#865650) +- own ls-R in texmf-local directory + * Mon Nov 14 2012 Jindrich Novy 2012-8-20121115 - prevent sed from being verbose in install log when uninstalling - be sure the old /usr/share/texmf tree is indexed and searched by diff --git a/tl2rpm.c b/tl2rpm.c index 322bab1..902083a 100644 --- a/tl2rpm.c +++ b/tl2rpm.c @@ -1458,6 +1458,10 @@ void solve(char *name) { fprintf(fpack, "Provides: chktex = %%{tl_version}\n"); fprintf(fpack, "Obsoletes: chktex < %%{tl_version}\n"); } + if ( !strcmp(name, "metauml") ) { /* rhbz#573863 */ + fprintf(fpack, "Provides: metapost-metauml = %%{tl_version}\n"); + fprintf(fpack, "Obsoletes: metapost-metauml < %%{tl_version}\n"); + } /* description */ #ifndef SRPMS fprintf(fpack, "\n%%description %s\n", name); @@ -2034,8 +2038,8 @@ void solve(char *name) { fprintf(fpack, "Obsoletes: lcdf-typetools < %%{tl_version}\n"); } if ( !strcmp(name, "xmltex") ) { - fprintf(fpack, "Provides: xmltex = %%{tl_version}\n"); - fprintf(fpack, "Obsoletes: xmltex < %%{tl_version}\n"); + fprintf(fpack, "Provides: xmltex = %%{tl_version}0101\n"); + fprintf(fpack, "Obsoletes: xmltex < %%{tl_version}0101\n"); } if ( !strcmp(name, "pstools") ) { fprintf(fpack, "Provides: ps2eps = %%{tl_version}\n"); diff --git a/tlpdb.patch b/tlpdb.patch index a5aebb1..4032d84 100644 --- a/tlpdb.patch +++ b/tlpdb.patch @@ -1,5 +1,5 @@ ---- texlive.tlpdb.orig 2012-11-15 07:49:20.833496922 +0100 -+++ texlive.tlpdb 2012-11-15 07:49:20.884497058 +0100 +--- texlive.tlpdb.orig 2012-11-20 08:33:59.473263610 +0100 ++++ texlive.tlpdb 2012-11-20 08:33:59.545263859 +0100 @@ -76,7 +76,7 @@ catalogue-ctan /macros/latex/contrib/abc catalogue-date 2008-03-08 20:47:21 +0100 @@ -18,7 +18,7 @@ category Package revision 27228 shortdesc A font to typeset maths in Xe(La)TeX and Lua(La)TeX. -@@ -25068,7 +25068,6 @@ +@@ -24596,7 +24596,6 @@ shortdesc TeX Live documentation relocated 1 depend texlive-common @@ -26,8 +26,8 @@ depend texlive-en name collection-documentation-bulgarian -@@ -25367,7 +25366,7 @@ - revision 28220 +@@ -24895,7 +24894,7 @@ + revision 28309 shortdesc Extra fonts relocated 1 -depend Asana-Math @@ -35,8 +35,8 @@ depend adforn depend adfsymbols depend allrunes -@@ -25487,7 +25486,7 @@ - depend libertine-type1 +@@ -25013,7 +25012,7 @@ + depend libertine depend libertineotf depend libris -depend linearA @@ -44,7 +44,7 @@ depend lxfonts depend ly1 depend mathabx -@@ -25846,7 +25845,7 @@ +@@ -25372,7 +25371,7 @@ depend cns depend ctex depend dnp @@ -53,7 +53,7 @@ depend garuda-c90 depend hyphen-chinese depend ipaex -@@ -27358,7 +27357,7 @@ +@@ -26885,7 +26884,7 @@ depend m-tx depend musixguit depend musixtex @@ -62,7 +62,7 @@ depend pmx depend songbook depend collection-latex -@@ -27797,25 +27796,6 @@ +@@ -27324,25 +27323,6 @@ depend texinfo depend collection-basic @@ -88,7 +88,7 @@ name collection-xetex category Collection revision 28124 -@@ -49195,7 +49175,7 @@ +@@ -48745,7 +48725,7 @@ catalogue-license lppl1.3 catalogue-version v2.2b @@ -97,7 +97,7 @@ category Package revision 25417 shortdesc Thai fonts for LaTeX from TLWG. -@@ -60274,13 +60254,6 @@ +@@ -59826,13 +59806,6 @@ catalogue-license lppl catalogue-version v1.6b @@ -111,7 +111,7 @@ name interactiveworkbook category Package revision 15878 -@@ -69543,7 +69516,7 @@ +@@ -69096,7 +69069,7 @@ catalogue-ctan /macros/latex/contrib/labels catalogue-date 2009-09-29 00:01:21 +0200 catalogue-license lppl1.2 @@ -120,7 +120,7 @@ name lacheck category TLCore -@@ -75063,7 +75036,7 @@ +@@ -74799,7 +74772,7 @@ catalogue-date 2007-01-08 23:14:30 +0100 catalogue-license lppl @@ -129,7 +129,7 @@ category Package revision 15878 shortdesc Linear A script fonts. -@@ -77289,7 +77262,7 @@ +@@ -77031,7 +77004,7 @@ catalogue-ctan /info/lshort/persian catalogue-date 2009-11-09 23:05:00 +0100 catalogue-license pd @@ -138,7 +138,7 @@ name lshort-polish category Package -@@ -86225,7 +86198,7 @@ +@@ -85967,7 +85940,7 @@ catalogue-license lppl1.3 catalogue-version 1.2.2 @@ -147,7 +147,7 @@ category Package revision 24517 shortdesc Fonts used by MusixTeX. -@@ -101419,7 +101392,7 @@ +@@ -101157,7 +101130,7 @@ catalogue-ctan /graphics/pstricks/contrib/pst-layout catalogue-date 2011-05-27 12:35:46 +0200 catalogue-license lppl @@ -156,7 +156,7 @@ name pst-lens category Package -@@ -120831,7 +120804,6 @@ +@@ -120569,7 +120542,6 @@ revision 13663 shortdesc i386-linux files of texlive-scripts binfiles arch=i386-linux size=2 @@ -164,7 +164,7 @@ bin/i386-linux/rungs name texlive-sr -@@ -129936,7 +129908,7 @@ +@@ -129674,7 +129646,7 @@ catalogue-ctan /macros/latex209/contrib/trees/tree-dvips catalogue-date 2011-03-14 14:09:23 +0100 catalogue-license lppl1 @@ -173,7 +173,7 @@ name treetex category Package -@@ -141269,7 +141241,6 @@ +@@ -141007,7 +140979,6 @@ revision 26912 shortdesc i386-linux files of xetex binfiles arch=i386-linux size=4837