Hello community, here is the log from the commit of package texlive checked in at Wed Mar 19 01:15:11 CET 2008. -------- --- texlive/texlive-bin.changes 2008-03-17 12:14:12.000000000 +0100 +++ /mounts/work_src_done/STABLE/texlive/texlive-bin.changes 2008-03-18 18:27:16.178720000 +0100 @@ -1,0 +2,7 @@ +Tue Mar 18 11:30:51 CET 2008 - werner@suse.de + +- Suggest not recommend documentation packages +- Make SuSEconfig.texlive error safe (bnc#372081) +- Do not use tcfmgr om TEXMFMAIN and TEXMFDISt + +------------------------------------------------------------------- texlive.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-bin.spec ++++++ --- /var/tmp/diff_new_pack.r16707/_old 2008-03-19 01:08:41.000000000 +0100 +++ /var/tmp/diff_new_pack.r16707/_new 2008-03-19 01:08:41.000000000 +0100 @@ -33,7 +33,7 @@ Summary: The Base System of TeXLive Group: Productivity/Publishing/TeX/Base Version: 2007 -Release: 141 +Release: 143 # Remark: Due license problems ./texk/dvi2tty and ./libs/libgsw32 are removed from Source0: source.tar.bz2 Source1: texmf-doc.tar.bz2 @@ -1153,6 +1153,16 @@ mv -v $f $g ln -sf $relpath/${f##*/} $f done + # Move shared/dist texconfig files back to lib/main texconfig + relpath=$(relpath %{_texmf_main}/texconfig %{_texmf_dist}/texconfig) + for f in %{buildroot}%{_texmf_dist}/texconfig/* ; do + test -e $f || continue + test -L $f && continue + g=%{buildroot}%{_texmf_main}/texconfig/${f##*/} + test -e $g || continue + mv -v $f $g + ln -sf $relpath/${f##*/} $f + done # Relink manual pages and info files relpath=$(relpath %{_texinfodir} %{_infodir}) for f in %{buildroot}%{_texinfodir}/*info* ; do @@ -1571,6 +1581,10 @@ %files -n texlive-bin-musictex -f lists/texlive-bin-musictex %changelog +* Tue Mar 18 2008 werner@suse.de +- Suggest not recommend documentation packages +- Make SuSEconfig.texlive error safe (bnc#372081) +- Do not use tcfmgr om TEXMFMAIN and TEXMFDISt * Mon Mar 17 2008 werner@suse.de - Use prepare checkin macros for last few changes. - Remove dependcy on not existing texlive-bin-ppower4 ++++++ texlive.spec ++++++ --- /var/tmp/diff_new_pack.r16707/_old 2008-03-19 01:08:41.000000000 +0100 +++ /var/tmp/diff_new_pack.r16707/_new 2008-03-19 01:08:41.000000000 +0100 @@ -30,12 +30,12 @@ Requires: /usr/bin/dialog /bin/ed /usr/bin/env /usr/bin/perl perl-Tk ghostscript_x11 Obsoletes: te_pscm te_etex te_pdf tetex Conflicts: te_eplai te_ams ntex -Recommends: texlive-doc +Suggests: texlive-doc AutoReqProv: on Summary: The Base System of TeXLive Group: Productivity/Publishing/TeX/Base Version: 2007 -Release: 142 +Release: 144 # Remark: Due license problems ./texk/dvi2tty and ./libs/libgsw32 are removed from Source0: source.tar.bz2 Source1: texmf-doc.tar.bz2 @@ -418,7 +418,7 @@ Requires: texlive Obsoletes: te_latex latex-beamer latex-pgf latex-ucs Conflicts: tetex -Recommends: texlive-latex-doc +Suggests: texlive-latex-doc Group: Productivity/Publishing/TeX/Base Summary: All About LaTeX AutoReqProv: on @@ -1266,6 +1266,16 @@ mv -v $f $g ln -sf $relpath/${f##*/} $f done + # Move shared/dist texconfig files back to lib/main texconfig + relpath=$(relpath %{_texmf_main}/texconfig %{_texmf_dist}/texconfig) + for f in %{buildroot}%{_texmf_dist}/texconfig/* ; do + test -e $f || continue + test -L $f && continue + g=%{buildroot}%{_texmf_main}/texconfig/${f##*/} + test -e $g || continue + mv -v $f $g + ln -sf $relpath/${f##*/} $f + done # Relink manual pages and info files relpath=$(relpath %{_texinfodir} %{_infodir}) for f in %{buildroot}%{_texinfodir}/*info* ; do @@ -1735,6 +1745,10 @@ %files -n texlive-nfs -f lists/texlive-nfs %changelog +* Tue Mar 18 2008 werner@suse.de +- Suggest not recommend documentation packages +- Make SuSEconfig.texlive error safe (bnc#372081) +- Do not use tcfmgr om TEXMFMAIN and TEXMFDISt * Mon Mar 17 2008 werner@suse.de - Use prepare checkin macros for last few changes. - Remove dependcy on not existing texlive-bin-ppower4 ++++++ pre_checkin.sh ++++++ --- texlive/pre_checkin.sh 2008-03-17 12:07:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/texlive/pre_checkin.sh 2008-03-18 11:26:28.297708000 +0100 @@ -31,6 +31,7 @@ OBSOLETES='s;@@OBSOLETES:[[:blank:]]*([[:print:]]+)@@;Obsoletes: \1;g' CONFLICTS='s;@@CONFLICTS:[[:blank:]]*([[:print:]]+)@@;Conflicts: \1;g' RECOMMENDS='s;@@RECOMMENDS:[[:blank:]]*([[:print:]]+)@@;Recommends: \1;g' + SUGGESTS='s;@@SUGGESTS:[[:blank:]]*([[:print:]]+)@@;Suggests: \1;g' NOSOURCE='\%@@NO(SOURCE|PATCH):[[:blank:]]*all@@%d' NODEBUGINFO='s;^(#[[:blank:]]*)(norootforbuild);\1\2\n\1nodebuginfo;' SRCHINT='\n%nil' @@ -51,6 +52,7 @@ OBSOLETES='\%@@OBSOLETES:[[:blank:]]*([[:print:]]+)@@%d' CONFLICTS='\%@@CONFLICTS:[[:blank:]]*([[:print:]]+)@@%d' RECOMMENDS='\%@@RECOMMENDS:[[:blank:]]*([[:print:]]+)@@%d' + SUGGESTS='\%@@SUGGESTS:[[:blank:]]*([[:print:]]+)@@%d' NOSOURCE=' /^Source[0-9]*:[[:blank:]]+.*/H /^Patch[0-9]*:[[:blank:]]+.*/H @@ -94,6 +96,7 @@ -e "$PROVIDES" \ -e "$OBSOLETES" \ -e "$RECOMMENDS" \ + -e "$SUGGESTS" \ -e "$NOSOURCE" \ -e "$NODEBUGINFO" \ -e "$WARNING" \ ++++++ SuSEconfig.texlive ++++++ --- texlive/SuSEconfig.texlive 2008-03-11 16:58:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/texlive/SuSEconfig.texlive 2008-03-18 18:24:18.543882000 +0100 @@ -9,7 +9,7 @@ # Author: Werner Fink, 1997-2007 # -declare -r OLDIFS="$IFS" +typeset -r OLDIFS="$IFS" test -r /etc/sysconfig/suseconfig && . /etc/sysconfig/suseconfig unset ${!LC_*} @@ -46,22 +46,35 @@ # Be sure that configuring in /etc/texmf will work even if # there are files relative to /etc/texmf ... unset KPSE_DOT || true -: ${TEXMFMAIN:=$(kpsewhich --expand-path='$TEXMFMAIN')} -: ${TEXMFVAR:=$(kpsewhich --var-value=TEXMFVAR)} -: ${TEXMFCNF:=$(kpsewhich texmf.cnf)} -: ${TEXMFSYSCONFIG:=$(kpsewhich --expand-path='$TEXMFSYSCONFIG')} +: ${TEXMFMAIN:=$(kpsewhich --expand-path='$TEXMFMAIN' 2> /dev/null)} +: ${TEXMFDIST:=$(kpsewhich --expand-path='$TEXMFDIST' 2> /dev/null)} +: ${TEXMFVAR:=$(kpsewhich --var-value=TEXMFVAR 2> /dev/null)} +: ${TEXMFCNF:=$(kpsewhich texmf.cnf 2> /dev/null)} +: ${TEXMFSYSCONFIG:=$(kpsewhich --expand-path='$TEXMFSYSCONFIG' 2> /dev/null)} +: ${TEXMFLSR:=$(kpsewhich --show-path=ls-R 2> /dev/null)} : ${WEB2C:=$TEXMFVAR/web2c} +HASHLSR= +for lsr in ${TEXMFLSR//:/ }; do + find $lsr -prune -type d -and -not -fstype nfs > /dev/null 2>&1 || continue + HASHLSR=${HASHLSR:+$HASHLSR:}${lsr} + size=$(find /etc/texmf/ls-R -follow -printf '%s') + if test $size -lt 80 ; then + mkdir -p /var/adm/SuSEconfig + > /var/adm/SuSEconfig/run-texhash; + fi +done + tcfmgr () { - ${TEXMFMAIN}/texconfig/tcfmgr ${1+"$@"} + ${TEXMFMAIN}/texconfig/tcfmgr ${1+"$@"} 2> /dev/null } enablemaps () { updmap-sys --quiet --nohash --listmaps < /dev/null 2> /dev/null | \ sed -n -r 's@(#![[:space:]])(Mixed)?Map[[:space:]]*@@gp' | \ - xargs -r kpsewhich --format=map | \ + xargs -r kpsewhich --format=map 2> /dev/null | \ sed -r 's@.*/([^/]*)@\1@g' } @@ -70,17 +83,10 @@ # for f in /var/adm/SuSEconfig/run?texhash; do test -e $f || continue - IFS=':' - set -- $(kpsewhich --show-path=ls-R | sed -r 's/[:;]+/:/g' 2> /dev/null) - IFS="$OLDIFS" - if test $# -gt 0 ; then - set -- $(find $@ -prune -type d -and -not -fstype nfs -print 2> /dev/null) - for lsr ; do - test $f -nt $lsr/ls-R && texhash $lsr - done - else - texhash - fi + for lsr in ${HASHLSR//:/ }; do + find $lsr -prune -type d -and -not -fstype nfs > /dev/null 2>&1 || continue + test $f -nt $lsr/ls-R && texhash $lsr + done cfg=$(tcfmgr --cmd find --file updmap.cfg) if test -e ${cfg} ; then updmap-sys --quiet --nohash --nomkmap --syncwithtrees < /dev/null 2> /dev/null @@ -149,8 +155,13 @@ cnf_mfont=$(tcfmgr --cmd find --file mktex.cnf) cnf_xdvi=$(tcfmgr --cmd find --file XDvi) cnf_dvips=$(tcfmgr --cmd find --file config.ps) - cnf_lang=$(TEXMF=$TEXMFSYSCONFIG kpsewhich language.dat) - cnf_base=$(TEXMF=$TEXMF kpsewhich language.us) + cnf_lang=$(TEXMF=$TEXMFSYSCONFIG kpsewhich language.dat 2> /dev/null) + cnf_base=$(TEXMF=$TEXMF kpsewhich language.us 2> /dev/null) + +test -n "${cnf_mfont}" || exit 0 +test -n "${cnf_xdvi}" || exit 0 +test -n "${cnf_dvips}" || exit 0 +test -n "${cnf_lang}" || exit 0 md5_mfont=${MD5DIR}${cnf_mfont} md5_xdvi=${MD5DIR}${cnf_xdvi} ++++++ texlive.spec.in ++++++ --- texlive/texlive.spec.in 2008-03-17 12:16:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/texlive/texlive.spec.in 2008-03-18 17:23:40.537569000 +0100 @@ -28,7 +28,7 @@ Requires: /usr/bin/dialog /bin/ed /usr/bin/env /usr/bin/perl perl-Tk ghostscript_x11 Obsoletes: te_pscm te_etex te_pdf tetex Conflicts: te_eplai te_ams ntex -@@RECOMMENDS: texlive-doc@@ +@@SUGGESTS: texlive-doc@@ AutoReqProv: on Summary: The Base System of TeXLive Group: Productivity/Publishing/TeX/Base @@ -429,7 +429,7 @@ Requires: texlive Obsoletes: te_latex latex-beamer latex-pgf latex-ucs Conflicts: tetex -@@RECOMMENDS: texlive-latex-doc@@ +@@SUGGESTS: texlive-latex-doc@@ Group: Productivity/Publishing/TeX/Base Summary: All About LaTeX AutoReqProv: on @@ -607,14 +607,11 @@ - Authors: -------- David Carlisle Sebastian Rahtz - - %package -n @@NAME@@-jadetex @@PREREQ-jadetex@@ @@PROVIDES: JadeTeX jadetex@@ @@ -627,8 +624,8 @@ %description -n @@NAME@@-jadetex With Sebastian Rahtz's macro package jadetex, it is possible to process the output of the TeX back-end for OpenJade and produce DVI or PDF -files. Resulting DVI files are viewable with xdvi or printable like -any other DVI file. +files. Resulting DVI files are viewable with xdvi or printable like any +other DVI file. Authors: @@ -1345,6 +1342,17 @@ ln -sf $relpath/${f##*/} $f done + # Move shared/dist texconfig files back to lib/main texconfig + relpath=$(relpath %{_texmf_main}/texconfig %{_texmf_dist}/texconfig) + for f in %{buildroot}%{_texmf_dist}/texconfig/* ; do + test -e $f || continue + test -L $f && continue + g=%{buildroot}%{_texmf_main}/texconfig/${f##*/} + test -e $g || continue + mv -v $f $g + ln -sf $relpath/${f##*/} $f + done + # Relink manual pages and info files relpath=$(relpath %{_texinfodir} %{_infodir}) for f in %{buildroot}%{_texinfodir}/*info* ; do ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org