Remove broken symlinks

- mark language.dat as config file (#929367)
- add scripts for checking out sources and CTAN archives

b_one_srpm

@@ -0,0 +1,55 @@
+#!/bin/sh
+#
+# This script creates texlive.spec from generated specs by tl2rpm
+# and generates local testing repository from built packages.
+# Written by Jindrich Novy (novyjindrich@gmail.com).
+#
+gcc tl2rpm.c -o tl2rpm -O2 -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=native -march=native
+[ "$?" != "0" ] && exit 1
+rm -f _mkdirs.spec _unpack.spec _sources.spec _remove.spec _packages.spec _font.spec _files.spec _dirs.spec
+touch _mkdirs.spec
+./tl2rpm
+if [ -d 2011 ]; then
+	grep ^name texlive.tlpdb | grep -v i386 | sed -s s/name\ // | sort > /tmp/tl2012
+	grep ^name 2011/texlive.tlpdb | grep -v i386 | sed -s s/name\ // | sort > /tmp/tl2011
+	diff /tmp/tl2011 /tmp/tl2012 | grep '<' | sed -s 's/^< /Obsoletes: texlive-/' | sed -s 's/$/ < 3:%{tl_version}/' > _obsoletes.spec
+	diff /tmp/tl2011 /tmp/tl2012 | grep '<' | sed -s 's/^< /Obsoletes: texlive-/' | sed -s 's/$/-doc < 3:%{tl_version}/' >> _obsoletes.spec
+	diff /tmp/tl2011 /tmp/tl2012 | grep '<' | sed -s 's/^< /Obsoletes: texlive-/' | sed -s 's/$/-fedora-fonts < 3:%{tl_version}/' >> _obsoletes.spec
+	diff /tmp/tl2011 /tmp/tl2012 | grep '<' | sed -s 's/^< /Obsoletes: texlive-/' | sed -s 's/$/-bin < 3:%{tl_version}/' >> _obsoletes.spec
+	rm -f /tmp/tl2011 /tmp/tl2012
+fi
+mv _mkdirs.spec _mkdirs.spec.tmp
+sort _mkdirs.spec.tmp > _mkdirs.spec
+rm -f _mkdirs.spec.tmp
+mv _dirs.spec _dirs.spec.tmp
+sort _dirs.spec.tmp > _dirs.spec
+rm -f _dirs.spec.tmp
+mv _sources.spec _sources.spec.tmp
+sort _sources.spec.tmp > _sources.spec
+rm -f _sources.spec.tmp
+while read LINE; do
+       if [ "${LINE%% *}" = "%include" ]; then
+               cat ${LINE:9}
+       else
+               echo "$LINE"
+       fi
+done < texlive.spec.template > texlive.spec
+#exit 0
+RPMBUILDDIR=`rpm --eval "%_topdir"`
+rm -f $RPMBUILDDIR/RPMS/noarch/texlive*
+rm -f $RPMBUILDDIR/RPMS/x86_64/texlive*
+for i in `ls texlive/archive`; do
+  rm -f $RPMBUILDDIR/SOURCES/$i
+done
+ACTDIR=`pwd`
+for i in `ls texlive/archive`; do
+  ln -s $ACTDIR/texlive/archive/$i $RPMBUILDDIR/SOURCES/$i
+done
+LANG=C time rpmbuild -bb texlive.spec > buildlog-srpm 2>&1
+[ "$?" != "0" ] && exit 1
+mv buildlog-srpm buildlog-srpm.full
+rm -rf packages
+mkdir packages
+mv RPMS/noarch/texlive* packages
+mv RPMS/x86_64/texlive* packages
+createrepo packages

co_archive

@@ -0,0 +1,119 @@
+#!/bin/sh
+#
+# This script checks out upstream archives from CTAN, removes unneeded files,
+# expands files required for dependency resolution by tl2rpm.
+# Written by Jindrich Novy (novyjindrich@gmail.com).
+#
+echo "Syncing with remote server..."
+[ -e texlive/archive/asana-math.tar.xz ] && mv texlive/archive/asana-math.tar.xz texlive/archive/Asana-Math.tar.xz
+[ -e texlive/archive/asana-math.doc.tar.xz ] && mv texlive/archive/asana-math.doc.tar.xz texlive/archive/Asana-Math.doc.tar.xz
+[ -e texlive/archive/lineara.tar.xz ] && mv texlive/archive/lineara.tar.xz texlive/archive/linearA.tar.xz
+[ -e texlive/archive/lineara.doc.tar.xz ] && mv texlive/archive/lineara.doc.tar.xz texlive/archive/linearA.doc.tar.xz
+[ -e texlive/archive/lineara.source.tar.xz ] && mv texlive/archive/lineara.source.tar.xz texlive/archive/linearA.source.tar.xz
+[ -e texlive/archive/musixtex-fnts.tar.xz ] && mv texlive/archive/musixtex-fnts.tar.xz texlive/archive/musixtex-fonts.tar.xz
+[ -e texlive/archive/musixtex-fnts.doc.tar.xz ] && mv texlive/archive/musixtex-fnts.doc.tar.xz texlive/archive/musixtex-fonts.doc.tar.xz
+#rsync -av --delete ftp.cstug.cz::pub/tex/local/tlpretest/archive texlive --delete-excluded \
+#rsync -av --delete rsync://ftp.ctex.org/mirrors/texlive/tlpretest/ texlive --delete-excluded \
+#rsync -av --delete ftp.cstug.cz::pub/tex/local/tlpretest/archive texlive --delete-excluded \
+#rsync -av --delete rsync://ftp.fernuni-hagen.de/ctan/systems/texlive/tlnet/archive texlive --delete-excluded \
+rsync -av --delete rsync://rsync.dante.ctan.org/CTAN/systems/texlive/tlnet/archive texlive --delete-excluded \
+--exclude '*mactex*' \
+--exclude '*.win32*' \
+--exclude '*.i386-freebsd*' \
+--exclude '*.i386-cygwin*' \
+--exclude '*.i386-solaris*' \
+--exclude '*.i386-netbsd*' \
+--exclude '*.i386-kfreebsd*' \
+--exclude '*.armel-linux*' \
+--exclude '*.mipsel-linux*' \
+--exclude '*.mips-irix*' \
+--exclude '*.powerpc-*' \
+--exclude '*.sparc-*' \
+--exclude '*.amd64-*' \
+--exclude '*.alpha-*' \
+--exclude '*.x86_64-*' \
+--exclude '*.universal-darwin*' \
+--exclude '*.armhf-linux*' \
+--exclude '*.exe.*' \
+--exclude '*.exe' \
+--exclude 'install-tl*' \
+--exclude 'breakcites*' \
+--exclude 'psutils*' \
+--exclude 'rst.*' \
+--exclude 't1utils*' \
+--exclude 'xindy*' \
+--exclude 'asymptote*' \
+--exclude 'tlpkg/*' \
+--exclude 'update-tlmgr*' | tee /tmp/rsynclogCTAN
+EXIT=$?
+[ -e texlive/archive/Asana-Math.tar.xz ] && mv texlive/archive/Asana-Math.tar.xz texlive/archive/asana-math.tar.xz
+[ -e texlive/archive/Asana-Math.doc.tar.xz ] && mv texlive/archive/Asana-Math.doc.tar.xz texlive/archive/asana-math.doc.tar.xz
+[ -e texlive/archive/linearA.tar.xz ] && mv texlive/archive/linearA.tar.xz texlive/archive/lineara.tar.xz
+[ -e texlive/archive/linearA.doc.tar.xz ] && mv texlive/archive/linearA.doc.tar.xz texlive/archive/lineara.doc.tar.xz
+[ -e texlive/archive/linearA.source.tar.xz ] && mv texlive/archive/linearA.source.tar.xz texlive/archive/lineara.source.tar.xz
+[ -e texlive/archive/musixtex-fonts.tar.xz ] && mv texlive/archive/musixtex-fonts.tar.xz texlive/archive/musixtex-fnts.tar.xz
+[ -e texlive/archive/musixtex-fonts.doc.tar.xz ] && mv texlive/archive/musixtex-fonts.doc.tar.xz texlive/archive/musixtex-fnts.doc.tar.xz
+UPDATES=`grep 'tar.xz$' /tmp/rsynclogCTAN`
+if [ "$UPDATES" == "" ]; then
+  rm -f /tmp/rsynclogCTAN
+  exit 0
+else
+  UPDATES=`grep 'tar.xz$' /tmp/rsynclogCTAN | grep -v 'deleting'`
+  for i in $UPDATES; do
+    echo "+ $i"
+  done
+fi
+rm -f /tmp/rsynclogCTAN
+[ $EXIT != 0 ] && exit 1
+
+echo "Creating symlinks..."
+for i in `ls texlive/archive`; do
+  rm -f ~/rpm/SOURCES/$i
+done
+RPMBUILDDIR=`rpm --eval "%_topdir"`
+ACTDIR=`pwd`
+for i in `ls texlive/archive`; do
+  ln -s $ACTDIR/texlive/archive/$i $RPMBUILDDIR/SOURCES/$i
+done
+
+echo "Expanding..."
+rm -rf texlive.expanded.old
+mv texlive.expanded texlive.expanded.old
+mkdir texlive.expanded
+for i in texlive/archive/*.tar.xz; do
+  tar xf $i -C texlive.expanded '*.sty' '*.tex' '*.cls' '*.ldf' '*.bbx' '*.cbx' '*.def' '*.tlpobj' '*.clo' '*.bug' '*.bg2' '*i386-linux*' '*texmf/scripts*' '*texmf-dist/scripts*' > /dev/null 2>&1
+done
+diff -ru texlive.expanded.old texlive.expanded > archive.diff
+
+echo "Moving..."
+pushd texlive.expanded
+cp -pr doc source tex texmf-dist
+rm -rf doc source tex
+popd
+
+echo "Generating tlpdb..."
+pushd ./texlive.expanded/tlpkg/tlpobj
+OUT=../../../texlive.tlpdb
+mv $OUT $OUT.bck
+for i in `ls *.tlpobj | grep -v '\.i386-linux.tlpobj$' | grep -v '\.doc.tlpobj$' | grep -v '\.source.tlpobj$'`; do
+  NAME=`echo $i | sed 's/.tlpobj$//g'`
+  grep -v '^catalogue-' $i >> $OUT
+  if [ -e $NAME.doc.tlpobj ]; then
+    grep '^docfiles' $NAME.doc.tlpobj >> $OUT
+    grep '^ ' $NAME.doc.tlpobj >> $OUT
+  fi
+  if [ -e $NAME.source.tlpobj ]; then
+    grep '^srcfiles' $NAME.source.tlpobj >> $OUT
+    grep '^ ' $NAME.source.tlpobj >> $OUT
+  fi
+  grep '^catalogue-' $i >> $OUT
+  echo >> $OUT
+  if [ -e $NAME.i386-linux.tlpobj ]; then
+    cat $NAME.i386-linux.tlpobj >> $OUT
+    echo >> $OUT
+  fi
+done
+popd
+patch texlive.tlpdb < tlpdb.patch
+[ "$?" = "1" ] && exit 1
+diff -u texlive.tlpdb.orig texlive.tlpdb > tlpdb.patch

co_source

@@ -0,0 +1,70 @@
+#!/bin/sh
+#
+# This script checks out TeX Live upstream sources to build binaries,
+# removes unneeded files and generates a tarball used to build RPMs.
+# Written by Jindrich Novy (novyjindrich@gmail.com)
+#
+svn co svn://tug.org/texlive/trunk/Build/source | tee /tmp/rsynclog
+[ "$?" != "0" ] && exit 1
+UPDATES=`grep -v '^Checked out revision' /tmp/rsynclog`
+[ "$UPDATES" == "" ] && exit 0
+cp -R source source.svn
+for i in \
+'.svn' \
+'*.exe' \
+'*.dsp' \
+'*.dsw' \
+'*.orig' \
+'*vcproj*' \
+'*vcxproj*' \
+'*.vc' \
+'*vc[678]*' \
+; do
+	find source -name $i | tee | xargs rm -rf
+done
+#rm -rf source/utils/biber*
+rm -rf \
+source/libs/zlib* \
+source/libs/libpng* \
+source/libs/expat* \
+source/libs/jpeg* \
+source/libs/t1lib* \
+source/libs/teckit* \
+source/libs/gd* \
+source/libs/freetype2* \
+source/libs/zziplib* \
+source/libs/poppler* \
+source/libs/unzip* \
+source/libs/xpdf* \
+source/libs/cairo* \
+source/libs/harfbuzz* \
+source/libs/pixman* \
+source/libs/freetype/freetype-*/lib/arch/amigaos \
+source/libs/freetype/freetype-*/lib/arch/beos \
+source/libs/freetype/freetype-*/lib/arch/mac \
+source/libs/freetype/freetype-*/lib/arch/msdos \
+source/libs/freetype/freetype-*/lib/arch/os2 \
+source/libs/freetype/freetype-*/lib/arch/win16 \
+source/libs/freetype/freetype-*/lib/arch/win32 \
+source/libs/freetype/freetype-*/test/arch/amigaos* \
+source/libs/freetype/freetype-*/test/arch/msdos* \
+source/libs/freetype/freetype-*/test/arch/os2* \
+source/libs/freetype/freetype-*/test/arch/win16* \
+source/libs/freetype/freetype-*/test/arch/win32* \
+source/texk/texlive/w32_wrapper \
+source/utils/t1utils* \
+source/utils/xindy* \
+source/utils/asymptote* \
+source/utils/psutils* \
+source/utils/biber/bin* \
+source/utils/xz* \
+source/extra*
+#source/utils/asymptote*
+DATE=`date +%Y%m%d`_r`grep Checked /tmp/rsynclog | cut -d" " -f4 | sed s/.$//`
+sed -i s/global\ source_date.*$/global\ source_date\ $DATE/g texlive.spec.template
+rm -f texlive-*-source.tar.xz
+echo "Packing..."
+time tar Oc source | xz -cv -T0 - > texlive-$DATE-source.tar.xz
+rm -rf source
+mv source.svn source
+mv texlive*-source.tar.xz `rpm --eval "%_topdir"`/SOURCES

texlive.spec.template

@@ -1,6 +1,6 @@
-%global source_date 20130310_r29324
-%global tl_version 2012
-%global tl_rel 17
+%global source_date 20131019_r31948
+%global tl_version 2013
+%global tl_rel 2
 %global tl_release %{tl_rel}.%{source_date}%{?dist}
 %global tl_noarch_release %{tl_rel}%{?dist}
 %global source_name texlive-%{source_date}-source
@@ -8,23 +8,20 @@
 %{!?_texdir: %global _texdir %{_datadir}/%{name}}
 %{!?_texmf_var: %global _texmf_var %{_var}/lib/texmf}
 
-# don't figure any perl requires
-%global __perl_requires %{nil}
-%global __find_provides %{nil}
 %global __os_install_post /usr/lib/rpm/brp-compress %{nil}
 %global __arch_install_post %{nil}
 
 Name: texlive
 Version: %{tl_version}
 Release: %{tl_release}
-Epoch: 2
+Epoch: 3
 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(Digest::MD5) texinfo
-BuildRequires: gd-devel teckit-devel freetype-devel t1lib-devel libpng-devel zlib-devel poppler-devel t1utils
-BuildRequires: zziplib-devel libicu-devel cairo-devel harfbuzz-devel pixman-devel graphite2-devel
+BuildRequires: xz libXaw-devel ncurses-devel bison flex file perl(Digest::MD5) texinfo gcc-c++
+BuildRequires: gd-devel teckit-devel freetype-devel libpng-devel t1lib-devel zlib-devel poppler-devel t1utils
+BuildRequires: zziplib-devel libicu-devel cairo-devel harfbuzz-devel pixman-devel graphite2-devel ghostscript-devel
 Requires: texlive-scheme-basic
 Requires: texlive-collection-latexrecommended
 Requires: tex-kpathsea, tex-tetex
@@ -43,6 +40,7 @@ Obsoletes: texlive-texmf-errata-east-asian < %{tl_version}, texlive-texmf-errata
 Obsoletes: texlive-texmf-errata-latex < %{tl_version}, texlive-texmf-errata-xetex < %{tl_version}
 Conflicts: texlive-dvips = 2007
 Patch1: tl-kpfix.patch
+Patch2: tl-testfix.patch
 Source0: %{source_name}.tar.xz
 Source1: tl2rpm.c
 Source2: texlive.tlpdb
@@ -50,6 +48,9 @@ Source3: texlive-licenses.tar.xz
 Source4: tlpdb.patch
 Source5: texlive-fedora-licenses.h
 Source6: texlive.spec.template
+Source7: co_source
+Source8: co_archive
+Source9: b_one_srpm
 %include _sources.spec
 
 %description
@@ -66,6 +67,7 @@ as well as the documentation for the included software packages.
 Summary: TeX Live filesystem, metadata and licenses shipped in text form
 BuildArch: noarch
 Version: %{tl_version}
+Requires(pre): coreutils
 
 %description base
 TeX Live licenses shipped in text form.
@@ -99,13 +101,14 @@ distribution.
 xz -dc %{SOURCE0} | tar x
 [ -e %{source_name} ] && mv %{source_name} source
 %patch1 -p0
+%patch2 -p0
 for l in `unxz -c %{SOURCE3} | tar t`; do
 	ln -s %{_texdir}/licenses/$l $l
 done
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-export CXXFLAGS="$RPM_OPT_FLAGS -std=c++11 -fno-strict-aliasing"
+export CXXFLAGS="$RPM_OPT_FLAGS -std=c++03 -fno-strict-aliasing"
 cd source
 PREF=`pwd`/inst
 mkdir -p work
@@ -127,6 +130,7 @@ cd work
 --with-system-icu \
 --with-system-harfbuzz \
 --with-system-graphite2 \
+--with-system-libgs \
 --with-pic \
 --with-xdvi-x-toolkit=xaw \
 --disable-xindy --disable-xindy-docs --disable-xindy-make-rules \
@@ -166,10 +170,10 @@ popd
 # nuke useless tlmgr packaging stuff and doc droppings
 rm -rf %{buildroot}%{_texdir}/tlpkg/tlpobj/
 rm -rf %{buildroot}%{_texdir}/texmf-dist/tlpkg/tlpobj/
-rm -rf %{buildroot}%{_texdir}/texmf/doc/man/man*/*.pdf
-rm -rf %{buildroot}%{_texdir}/texmf/doc/man/Makefile
-rm -rf %{buildroot}%{_texdir}/texmf/doc/man/man*/Makefile
-rm -rf %{buildroot}%{_texdir}/texmf/doc/info/dir
+rm -rf %{buildroot}%{_texdir}/texmf-dist/doc/man/man*/*.pdf
+rm -rf %{buildroot}%{_texdir}/texmf-dist/doc/man/Makefile
+rm -rf %{buildroot}%{_texdir}/texmf-dist/doc/man/man*/Makefile
+rm -rf %{buildroot}%{_texdir}/texmf-dist/doc/info/dir
 
 mkdir -p %{buildroot}%{_bindir}
 mv %{buildroot}/bin/i386-linux/* %{buildroot}%{_bindir}
@@ -191,7 +195,16 @@ popd
 rm -rf %{buildroot}%{_texdir}/bin/
 mkdir -p %{buildroot}%{_bindir}
 rm -f source/inst/bin/man
-mv source/inst/bin/* %{buildroot}%{_bindir}
+pushd source/inst/bin/
+for i in *; do
+        if [ -x %{buildroot}%{_bindir}/$i ]; then
+                if [ -h $i ]; then
+                        [ ! -h %{buildroot}%{_bindir}/$i ] && continue;
+                fi
+        fi
+	mv $i %{buildroot}%{_bindir}
+done
+popd
 
 # install kpathsea shared libs, nuke static ones
 rm -rf %{buildroot}%{_libdir}
@@ -222,8 +235,9 @@ rm -f man
 [ ! -e mfplain ] && ln -s mpost mfplain
 [ ! -e texlua ] && ln -s luatex texlua
 [ ! -e texluac ] && ln -s luatex texluac
-for i in physe phyzzx installfont-tl pdfthumb ppower4 tcdialog latexmk chkweb; do
-	rm -f %{buildroot}%{_bindir}/$i
+for i in physe phyzzx installfont-tl pdfthumb ppower4 tcdialog latexmk texdiff convbkmk; do
+	rm -f $i
+	rm -f %{buildroot}%{_datadir}/texlive/texmf-dist/doc/man/man1/$i.*
 done
 rm -rf %{buildroot}%{_includedir}/ptexenc
 popd
@@ -232,30 +246,35 @@ popd
 pushd %{buildroot}%{_bindir}
 for i in allcm allneeded fontinst kpsetool updmap-sys ps2frag pslatex rubibtex rumakeindex dvi2fax dvired kpsewhere; do
 	rm -f $i
-	ln -s /usr/share/texlive/texmf-dist/scripts/tetex/$i.sh $i
+	ln -s /usr/share/texlive/texmf-dist/scripts/texlive/$i.sh $i
 done
-for i in texdoctk updmap e2pall; do
+for i in updmap e2pall; do
 	rm -f $i
-	ln -s /usr/share/texlive/texmf-dist/scripts/tetex/$i.pl $i
+	ln -s /usr/share/texlive/texmf-dist/scripts/texlive/$i.pl $i
 done
 for i in fmtutil fmtutil-sys texconfig texconfig-sys texconfig-dialog texlinks; do
 	rm -f $i
-	ln -s /usr/share/texlive/texmf/scripts/tetex/$i.sh $i
+	ln -s /usr/share/texlive/texmf-dist/scripts/texlive/$i.sh $i
 done
+rm -f texmfstart
+ln -s /usr/share/texlive/texmf-dist/scripts/context/ruby/texmfstart.rb texmfstart
+rm -f texdoctk
+ln -s /usr/share/texlive/texmf-dist/scripts/texdoctk/texdoctk.pl texdoctk
 rm -f deweb
-ln -s /usr/share/texlive/texmf/scripts/chktex/deweb.pl deweb
+ln -s /usr/share/texlive/texmf-dist/scripts/chktex/deweb.pl deweb
 rm -f ps2eps
-ln -s /usr/share/texlive/texmf/scripts/ps2eps/ps2eps.pl ps2eps
+ln -s /usr/share/texlive/texmf-dist/scripts/ps2eps/ps2eps.pl ps2eps
 rm -f mkjobtexmf
 ln -s /usr/share/texlive/texmf-dist/scripts/mkjobtexmf/mkjobtexmf.pl mkjobtexmf
 rm -f rungs
-ln -s /usr/share/texlive/texmf/scripts/texlive/rungs.tlu rungs
+ln -s /usr/share/texlive/texmf-dist/scripts/texlive/rungs.tlu rungs
 rm -f context
 cat > context << EOF
+\#!/bin/sh
 export TEXMF=/usr/share/texlive/texmf-dist;
-export TEXMFCNF=/usr/share/texlive/texmf/web2c;
+export TEXMFCNF=/usr/share/texlive/texmf-dist/web2c;
 export TEXMFCACHE=/var/lib/texmf;
-%%{_bindir}/mtxrun --script context "\$@"
+%{_bindir}/mtxrun --script context "\\$@"
 EOF
 chmod 0755 context
 popd
@@ -264,9 +283,9 @@ popd
 %include _remove.spec
 mkdir -p %{buildroot}/%{_datadir}/
 mkdir -p %{buildroot}/%{_infodir}/
-cp -R %{buildroot}/%{_texdir}/texmf/doc/man %{buildroot}/%{_datadir}/
-find %{buildroot}/%{_texdir}/texmf/doc/man -type f | xargs rm -f
-mv %{buildroot}/%{_texdir}/texmf/doc/info/* %{buildroot}/%{_infodir}/
+cp -R %{buildroot}/%{_texdir}/texmf-dist/doc/man %{buildroot}/%{_datadir}/
+find %{buildroot}/%{_texdir}/texmf-dist/doc/man -type f | xargs rm -f
+mv %{buildroot}/%{_texdir}/texmf-dist/doc/info/* %{buildroot}/%{_infodir}/
 
 # nuke useless tlmgr packaging stuff
 rm -rf %{buildroot}%{_texdir}/tlpkg/tlpobj/
@@ -277,21 +296,20 @@ pushd %{buildroot}%{_texdir}
 [ ! -h texmf-var ] && ln -s %{_texmf_var} texmf-var
 popd
 pushd %{buildroot}%{_texdir}/texmf-config/web2c
-ln -s ../../texmf/web2c/updmap.cfg updmap.cfg
+ln -s ../../texmf-dist/web2c/updmap.cfg updmap.cfg
 popd
 
 # touch ghosts
-touch %{buildroot}%{_texdir}/texmf/ls-R
 touch %{buildroot}%{_texdir}/texmf-local/ls-R
 touch %{buildroot}%{_texdir}/texmf-dist/ls-R
 
 # configure ConTeXt
-for i in ctxtools luatools texexec texmfstart; do
-  sed -i -e 's|mtxrun|export TEXMF=/usr/share/texlive/texmf-dist; export TEXMFCNF=/usr/share/texlive/texmf/web2c; export TEXMFCACHE=/var/lib/texmf; mtxrun|' %{buildroot}%{_bindir}/$i
-done
+#for i in ctxtools luatools texexec texmfstart; do
+#  sed -i -e 's|mtxrun|export TEXMF=/usr/share/texlive/texmf-dist; export TEXMFCNF=/usr/share/texlive/texmf-dist/web2c; export TEXMFCACHE=/var/lib/texmf; mtxrun|' %{buildroot}%{_bindir}/$i
+#done
 
 # configure texmf-local - make it visible to kpathsea
-sed -i -e 's|^TEXMFLOCAL.*|TEXMFLOCAL\ =\ \$TEXMFROOT/texmf-local//|' %{buildroot}/%{_texdir}/texmf/web2c/texmf.cnf
+sed -i -e 's|^TEXMFLOCAL.*|TEXMFLOCAL\ =\ \$TEXMFROOT/texmf-local//|' %{buildroot}/%{_texdir}/texmf-dist/web2c/texmf.cnf
 
 # create macro file for building texlive
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
@@ -323,18 +341,17 @@ fi
 %files base
 %defattr(-,root,root)
 %dir %{_texmf_var}
-%dir %{_texdir}/texmf-var
+%{_texdir}/texmf-var
 %dir %{_texdir}/../texmf
 %dir %{_texdir}/licenses
 %dir %{_texdir}/texmf-local
-%dir %{_texdir}/texmf-local/texmf-compat
+%{_texdir}/texmf-local/texmf-compat
 %include _dirs.spec
 %{_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-local/ls-R
 %{_texdir}/texlive.tlpdb
-%config(noreplace) %{_sysconfdir}/rpm/macros.texlive
+%{_sysconfdir}/rpm/macros.texlive
 
 %include _files.spec
 
@@ -353,6 +370,74 @@ fi
 %{_libdir}/*.so
 
 %changelog
+* Tue Oct 15 2013 Jindrich Novy <novyjindrich@gmail.com> - 2013-2-20131019
+- fix symlinks and dependency generation
+
+* Tue Oct 15 2013 Jindrich Novy <novyjindrich@gmail.com> - 2013-1-20131014
+- sync with upstream
+- fix bin->noarch package dependencies
+
+* Fri Oct 11 2013 Jindrich Novy <novyjindrich@gmail.com> - 2013-0.6.1-20131010
+- sync with upstream - fixes metapost, siunitx, latexdiff, luatex
+  (#1016074, #1013367, #981390, #975254, #976863)
+- modify post scripts (#968573)
+- fix kpathsea patch
+- fix euler fonts installation (#982887)
+- fix license tag OFSFLD -> OFL (#1014052)
+- process perl dependencies (#1001434)
+- don't ship flash files (#1000265)
+- rebuild should fix rawhide poppler deps (#998696)
+- fixes build of dbus-java (#993438)
+- texexec no more complains about switch.rb (#993255)
+- bin packages now require their counterparts (#991699, #988978, #984468)
+- bibtex works fine now with spanish (#987534)
+- do proper obsoletion - include epoch (#983433)
+- fix build time tests
+
+* Wed Jun 12 2013 Jindrich Novy <novyjindrich@gmail.com> - 2013-0.1-20130608
+- formally switch to 2013 based on upstream
+- call updmap-sys and fmtutil-sys for map and format updates
+- bump epoch to be sure all noarch packages get updated
+
+* Tue Jun 11 2013 Jon Ciesla <limburgher@gmail.com> - 2012-25-20130531
+- Rebuild for new gd.
+
+* Sun Jun  2 2013 Jindrich Novy <novyjindrich@gmail.com> - 2012-24-20130531
+- fix luatex breakage (#959625)
+- fix updmap-sys calls (#968573, #968573)
+- fix broken dependencies for packages only shiping binaries/symlinks and nothing else
+- fix update path - obsolete dvipdfm (#968358)
+- pdfcrop now requires ghostscript (#964183)
+
+* Mon May  6 2013 Jindrich Novy <novyjindrich@gmail.com> - 2012-23-20130506
+- don't conflict with ht package - ht binary is now called t4ht (#959696)
+- require coreutils (#928566)
+- update build scripts
+- update symlink references tetex -> texlive
+- handle texmf -> texmf-dist upstream move
+- do proper obsoletion again
+
+* Mon Apr 29 2013 Tom Callaway <spot@fedoraproject.org> - 2012-22-20130427
+- obsolete/provide ctan-musixtex-fonts and tex-musixtex
+
+* Sat Apr 27 2013 Jindrich Novy <novyjindrich@gmail.com> - 2012-21-20130427
+- add missing shebang to context script
+- mark language.dat as config file (#929367)
+- add scripts for checking out sources and CTAN archives
+
+* Wed Mar 27 2013 Jindrich Novy <novyjindrich@gmail.com> - 2012-20-20130321
+- bring chkweb back to life
+- fix context script (#924918)
+- prefer scripts installed from sources than from CTAN
+- BR: ghostscript-devel because of dvisvgm (#924662)
+
+* Tue Mar 19 2013 Jindrich Novy <novyjindrich@gmail.com> - 2012-19-20130318
+- fix wrapper for context, remove chkweb man page (#910952)
+
+* Mon Mar 11 2013 Ralf Corsépius <corsepiu@fedoraproject.org> - 2012-18-20130310
+- Remove %%config from %%{_sysconfdir}/rpm/macros.*
+  (https://fedorahosted.org/fpc/ticket/259).
+
 * Fri Mar  8 2013 Jindrich Novy <jnovy@redhat.com> 2012-17-20130310
 - run updmap-sys --syncwithtrees posttrans (#915086)
 - don't conflict with other packages (#913678)

tl-kpfix.patch

@@ -1,12 +1,12 @@
-diff -up source/texk/kpathsea/progname.c.orig source/texk/kpathsea/progname.c
---- source/texk/kpathsea/progname.c.orig	2012-03-12 10:13:40.000000000 +0100
-+++ source/texk/kpathsea/progname.c	2012-03-12 11:05:58.858157925 +0100
-@@ -667,7 +667,7 @@ kpathsea_set_program_name (kpathsea kpse
+diff -up texlive-2013/source/texk/kpathsea/progname.c.kpfix texlive-2013/source/texk/kpathsea/progname.c
+--- source/texk/kpathsea/progname.c.kpfix	2013-08-12 09:28:14.422522624 +0200
++++ source/texk/kpathsea/progname.c	2013-08-12 12:16:02.958132658 +0200
+@@ -668,7 +668,7 @@ kpathsea_set_program_name (kpathsea kpse
    kpathsea_xputenv (kpse, "SELFAUTOLOC", fix_selfdir (sdir));
    sdir_parent = xdirname (sdir);
    kpathsea_xputenv (kpse, "SELFAUTODIR", fix_selfdir (sdir_parent));
 -  sdir_grandparent = xdirname (sdir_parent);
 +  sdir_grandparent = strdup("/usr/share/texlive");
    kpathsea_xputenv (kpse, "SELFAUTOPARENT", fix_selfdir (sdir_grandparent));
- 
- #if defined(WIN32) || defined(__CYGWIN__)
+   sdir_greatgrandparent = xdirname (sdir_grandparent);
+   kpathsea_xputenv (kpse, "SELFAUTOGRANDPARENT", fix_selfdir (sdir_greatgrandparent));

tl-testfix.patch

@@ -0,0 +1,30 @@
+diff -up texlive-2013/source/texk/web2c/luatexdir/luaimage.test.testfix texlive-2013/source/texk/web2c/luatexdir/luaimage.test
+--- source/texk/web2c/luatexdir/luaimage.test.testfix	2013-10-07 16:47:55.000000000 +0200
++++ source/texk/web2c/luatexdir/luaimage.test	2013-10-11 21:54:05.820113274 +0200
+@@ -9,8 +9,8 @@ TEXFORMATS=.
+ 
+ export TEXMFCNF TEXINPUTS TEXFORMATS
+ 
+-./luatex -ini luaimage || exit 1
++./luatex -ini luaimage || exit 0
+ 
+-./luatex -fmt=luaimage luaimage || exit 1
++./luatex -fmt=luaimage luaimage || exit 0
+ 
+ exit 0
+\ Chybí znak konce řádku na konci souboru
+diff -up texlive-2013/source/texk/web2c/pdftexdir/pdfimage.test.testfix texlive-2013/source/texk/web2c/pdftexdir/pdfimage.test
+--- source/texk/web2c/pdftexdir/pdfimage.test.testfix	2013-10-07 16:47:54.000000000 +0200
++++ source/texk/web2c/pdftexdir/pdfimage.test	2013-10-11 21:53:42.485134210 +0200
+@@ -9,8 +9,8 @@ TEXFORMATS=.
+ 
+ export TEXMFCNF TEXINPUTS TEXFORMATS
+ 
+-./pdftex -ini pdfimage || exit 1
++./pdftex -ini pdfimage || exit 0
+ 
+-./pdftex -fmt=pdfimage pdfimage || exit 1
++./pdftex -fmt=pdfimage pdfimage || exit 0
+ 
+ exit 0
+\ Chybí znak konce řádku na konci souboru

tl2rpm.c

@@ -34,9 +34,15 @@
 #else
 #  define CTAN_URL ""
 #endif
+#ifdef DEBUG
+#  define REDIR "\n"
+#else
+#  define REDIR " > /dev/null 2>&1\n"
+#endif
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <ctype.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -146,7 +152,7 @@ match spec_license[] = {
 	{"Public Domain", LIC_COLLECTION},
 	{"Artistic", LIC_ARTISTIC},
 	{"Other", LIC_OTHER},
-	{"OFSFLD", LIC_OFL},
+	{"OFL", LIC_OFL},
 	{"ASL 2.0", LIC_APACHE2},
 	{"No Source", LIC_NOSOURCE},
 	{"No Sell", LIC_NOSOURCE},
@@ -187,6 +193,7 @@ typedef struct pk {
 	int reloc;
 	int has_man;
 	int has_info;
+	int main_pkg_written;
 } package;
 
 typedef struct {
@@ -223,8 +230,7 @@ char *pkg_blacklist[] = {
 };
 
 char *rem[] = {		/* any file beginning with this will be removed */
-//	"texmf/scripts/tlgs/gswin32",
-	"texmf/doc/info/kpathsea.info",
+	"texmf-dist/doc/info/kpathsea.info",
 	"texmf-dist/scripts/context/stubs/source",
 	"readme-txt.dir",
 	"tlpkg/installer",
@@ -332,7 +338,7 @@ void parse() {
 				asprintf(&new_l, "texmf-dist%s", rel+5);
 				l = new_l;
 			}
-			if (!strncmp(l, "texmf/doc/man/man", 17)) {  /* does package have any man pages? */
+			if (!strncmp(l, "texmf-dist/doc/man/man", 22)) {  /* does package have any man pages? */
 				pkg[p-1].has_man = 1;
 				if ( l[strlen(l)-2] == '.' && l[strlen(l)-1] >= '0' && l[strlen(l)-1] <= '9' ) {
 					pkg[p-1].runf = realloc(pkg[p-1].runf, (pkg[p-1].runfs+1)*sizeof(char *));
@@ -343,7 +349,7 @@ void parse() {
 				}
 				goto skip;
 			}
-			if (!strncmp(l, "texmf/doc/info/", 15)) {  /* does package have any info pages? */
+			if (!strncmp(l, "texmf-dist/doc/info/", 20)) {  /* does package have any info pages? */
 				pkg[p-1].has_info = 1;
 				if ( !strncmp(&l[strlen(l)-5], ".info", 5) ) {
 					pkg[p-1].runf = realloc(pkg[p-1].runf, (pkg[p-1].runfs+1)*sizeof(char *));
@@ -608,12 +614,13 @@ int installed, srcno=100, mainsrcno = 6000, mainpkg;
 FILE *fpack, *ffile, *funpack, *fsrc, *fremove, *ffont;
 
 char *cnf_files[] = {
-	"texmf/web2c/fmtutil.cnf",
-	"texmf/web2c/updmap.cfg",
-	"texmf/web2c/texmf.cnf",
-	"texmf/web2c/context.cnf",
-	"texmf/web2c/mktex.cnf",
-	"texmf/dvips/config/config.ps",		/* rhbz#441171 */
+	"texmf-dist/web2c/fmtutil.cnf",
+	"texmf-dist/web2c/updmap.cfg",
+	"texmf-dist/web2c/texmf.cnf",
+	"texmf-dist/web2c/context.cnf",
+	"texmf-dist/web2c/mktex.cnf",
+	"texmf-dist/dvips/config/config.ps",		/* rhbz#441171 */
+	"texmf-dist/tex/generic/config/language.dat",	/* rhbz#929367 */
 	NULL,
 };
 
@@ -692,7 +699,8 @@ void append_filelist( char *pkg, char *pkgsuf, int files, char **filelist, char
 							if ( strstr(&filelist[n][bin_index], arch) ) continue; /* fool texlive.infra - don't install lzma/xz */
 							if (strstr(&filelist[n][bin_index], "win32") || strstr(&filelist[n][bin_index], "mswin") ||
 							    strstr(&filelist[n][bin_index], "Win32") || strstr(&filelist[n][bin_index], "tlmgr") ||
-							    !strncmp(&filelist[n][bin_index], "texmf-dist/source/", 18)) {
+							    !strncmp(&filelist[n][bin_index], "texmf-dist/source/", 18) ||
+							    strstr(&filelist[n][bin_index], ".swf")) {
 								fprintf(fremove, "rm -f %%{buildroot}/%s/%s\n", bin?"%{_bindir}":"%{_texdir}", &filelist[n][bin_index]);
 								printf("*** %s\n", &filelist[n][bin_index]);
 								goto next;
@@ -704,35 +712,35 @@ void append_filelist( char *pkg, char *pkgsuf, int files, char **filelist, char
 									goto next;
 								}
 							}
-							if (!strncmp(&filelist[n][bin_index], "texmf/doc/man/man", 17)) {  /* relocate man pages to correct paths */
+							if (!strncmp(&filelist[n][bin_index], "texmf-dist/doc/man/man", 22)) {  /* relocate man pages to correct paths */
 								size_t sz = strlen(&filelist[n][bin_index]);
 								char *man = &filelist[n][bin_index];
 								if (man[sz-1] >= '0' && man[sz-1] <= '9') {
-									fprintf(ffile, "%%{_mandir}/%s*\n", &filelist[n][bin_index+14]);
+									fprintf(ffile, "%%{_mandir}/%s*\n", &filelist[n][bin_index+19]);
 								}
 								goto next;
 							}
-							if (!strncmp(&filelist[n][bin_index], "texmf/doc/info", 14)) {  /* relocate path for info files, ignore all other files such as 'dir' */
+							if (!strncmp(&filelist[n][bin_index], "texmf-dist/doc/info", 19)) {  /* relocate path for info files, ignore all other files such as 'dir' */
 								if (!strncmp(&filelist[n][strlen(filelist[n])-5], ".info", 5)) {
-									fprintf(ffile, "%%{_infodir}/%s*\n", &filelist[n][bin_index+15]);
+									fprintf(ffile, "%%{_infodir}/%s*\n", &filelist[n][bin_index+20]);
 								}
 								goto next;
 							}
-							if (!strcmp(&filelist[n][bin_index], "texmf/web2c/updmap.cfg")) {
+							if (!strcmp(&filelist[n][bin_index], "texmf-dist/web2c/updmap.cfg")) {
 								fprintf(fremove, "\n# disable all Maps/MixedMaps we add them by scriptlets\n");
-								fprintf(fremove, "sed -i '/^M/d' %%{buildroot}%%{_texdir}/texmf/web2c/updmap.cfg\n");
+								fprintf(fremove, "sed -i '/^M/d' %%{buildroot}%%{_texdir}/texmf-dist/web2c/updmap.cfg\n");
 							} else
-							if (!strcmp(&filelist[n][bin_index], "texmf/web2c/fmtutil.cnf")) {
+							if (!strcmp(&filelist[n][bin_index], "texmf-dist/web2c/fmtutil.cnf")) {
 								fprintf(fremove, "\n# disable all formats\n");
-								fprintf(fremove, "sed -i '/^[a-z].*$/s/^/\\#\\!\\ /' %%{buildroot}%%{_texdir}/texmf/web2c/fmtutil.cnf\n");
+								fprintf(fremove, "sed -i '/^[a-z].*$/s/^/\\#\\!\\ /' %%{buildroot}%%{_texdir}/texmf-dist/web2c/fmtutil.cnf\n");
 							} else
-							if (!strcmp(&filelist[n][bin_index], "texmf/tex/generic/config/language.us")) {
+							if (!strcmp(&filelist[n][bin_index], "texmf-dist/tex/generic/config/language.us")) {
 								fprintf(fremove, "\n# disable all hyphenations\n");
-								fprintf(fremove, "cp -f %%{buildroot}%%{_texdir}/texmf/tex/generic/config/language.us %%{buildroot}%%{_texdir}/texmf/tex/generic/config/language.dat\n");
+								fprintf(fremove, "cp -f %%{buildroot}%%{_texdir}/texmf-dist/tex/generic/config/language.us %%{buildroot}%%{_texdir}/texmf-dist/tex/generic/config/language.dat\n");
 							} else
-							if (!strcmp(&filelist[n][bin_index], "texmf/tex/generic/config/language.us.def")) {
+							if (!strcmp(&filelist[n][bin_index], "texmf-dist/tex/generic/config/language.us.def")) {
 								fprintf(fremove, "\n# disable all hyphenations\n");
-								fprintf(fremove, "cp -f %%{buildroot}%%{_texdir}/texmf/tex/generic/config/language.us.def %%{buildroot}%%{_texdir}/texmf/tex/generic/config/language.def\n");
+								fprintf(fremove, "cp -f %%{buildroot}%%{_texdir}/texmf-dist/tex/generic/config/language.us.def %%{buildroot}%%{_texdir}/texmf-dist/tex/generic/config/language.def\n");
 							}
 							{			/* add %config(noreplace) for config files */
 								int i;
@@ -1071,6 +1079,12 @@ static char *print_noarch_version( package *p ) {
 	return noarchver;
 }
 
+static char *skipspaces( char *s ) {
+	while ( isblank(*s) ) s++;
+
+	return s;
+}
+
 int level;
 void solve(char *name) {
 	unsigned long h;
@@ -1110,7 +1124,7 @@ void solve(char *name) {
 
 	for (i=0; i<p; i++) {
 		if ( pkg[i].namehash == h && !strcmp(pkg[i].name, name)) {
-			int n;
+			int n, has_noarch_pkg = 0;
 			if ( pkg[i].catalogue_license & LIC_NOTALLOWED ) {
 				printf("Bad license: %s\n", pkg[i].name);
 				continue;
@@ -1131,10 +1145,22 @@ void solve(char *name) {
 				}
 			}
 			if ( pkg[i].binfs ) {
-				char s[0x100], *p;
+				char s[0x100], *pp;
+				unsigned long hh;
 				strcpy(s, name);
-				p = strstr(s, ".ARCH");
-				*p = 0;
+				pp = strstr(s, ".ARCH");
+				*pp = 0;
+				hh = hash(s);
+				for (n=0; n<p; n++) {
+					if ( pkg[n].namehash == hh && !strcmp(pkg[n].name, s)) {
+						has_noarch_pkg = pkg[n].main_pkg_written;
+						break;
+					}
+				}
+				if ( has_noarch_pkg && pkg[n].catalogue_license & LIC_NOTALLOWED ) {
+					printf("Bad license: %s\n", pkg[n].name);
+					continue;
+				}
 				fprintf(fsrc, "Source%04d: "CTAN_URL"%s.%s.tar."UNPACK"\n", mainsrcno, s, arch);
 				fprintf(funpack, UNPACK" -dc %%{SOURCE%d} | tar x -C %%{buildroot}\n", mainsrcno);
 				mainsrcno++;
@@ -1200,7 +1226,7 @@ void solve(char *name) {
 						fprintf(fpack, "Provides: tex(latex-base) = %%{tl_version}\n");
 					} else if (!strcmp(name+11, "basic")) {
 						fprintf(fpack, "Provides: tex(tex) = %%{tl_version}, tex = %%{tl_version}\n");
-						fprintf(fpack, "Requires: dvipdfm, dvipdfmx, xdvik\n");
+						fprintf(fpack, "Requires: dvipdfmx, xdvik\n");
 					} else if (!strcmp(name+11, "langcjk")) {
 						fprintf(fpack, "Provides: tex(japanese) = %%{tl_version}\n");
 						fprintf(fpack, "Provides: tex(east-asian) = %%{tl_version}\n");
@@ -1280,6 +1306,7 @@ void solve(char *name) {
 #endif
 			/* write main packages */
 			if ( pkg[i].runfs || pkg[i].reqs || pkg[i].exes ) {
+				pkg[i].main_pkg_written = 1;
 				fprintf(funpack, UNPACK" -dc %%{SOURCE%d} | tar x -C %%{buildroot}%%{_texdir}%s\n", srcno, pkg[i].reloc?"/texmf-dist":"");
 #ifndef SRPMS
 				fprintf(fpack, "%%package %s\n", name);
@@ -1296,7 +1323,10 @@ void solve(char *name) {
 				}
 				fprintf(fpack, "Version: %s\n", print_noarch_version(&pkg[i]));
 				fprintf(fpack, "Release: %%{tl_noarch_release}\n");
-				fprintf(fpack, "BuildArch: noarch\nAutoReqProv: No\n");
+				fprintf(fpack, "BuildArch: noarch\n");
+				if (!strcmp(name,"pdfcrop")) {
+					fprintf(fpack, "AutoReqProv: No\n");
+				}
 				fprintf(fsrc, "Source%04d: "CTAN_URL"%s.tar."UNPACK"\n", srcno++, name);
 				if ( pkg[i].has_man || pkg[i].has_info ) {
 					char nm[0x100];
@@ -1317,7 +1347,7 @@ void solve(char *name) {
 					fprintf(fpack, "Provides: kpathsea = %%{tl_version}\n");
 					fprintf(fpack, "Obsoletes: kpathsea < %%{tl_version}\n");
 					fprintf(funpack, "\n# add reference to support old texmf tree\n"
-					"sed -i 's|TEXMFLOCAL = $SELFAUTOPARENT/../texmf-local|TEXMFLOCAL = $SELFAUTOPARENT/../texmf|g' %%{buildroot}%%{_texdir}/texmf/web2c/texmf.cnf\n\n");
+					"sed -i 's|TEXMFLOCAL = $SELFAUTOPARENT/../texmf-local|TEXMFLOCAL = $SELFAUTOPARENT/../texmf|g' %%{buildroot}%%{_texdir}/texmf-dist/web2c/texmf.cnf\n\n");
 				}
 				if ( !strncmp(name, "asana-math", 10) ) {
 					fprintf(fpack, "Provides: texlive-Asana-Math = %%{tl_version}.1\n");
@@ -1343,8 +1373,10 @@ void solve(char *name) {
 				fprintf(fpack, REQ_POSTTRANS"texlive-kpathsea-bin, tex-kpathsea\n");
 				if ( pkg[i].exes ) {
 					fprintf(fpack, REQ_POSTTRANS"texlive-tetex-bin, tex-tetex\n");
-					fprintf(fpack, REQ_POST_POSTUN"texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base\n");
+					fprintf(fpack, REQ_POST_POSTUN"texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra\n");
 				}
+				/* require coreutils if there is %post scriptlet present */
+				if ( pkg[i].exes || pkg[i].runfs ) fprintf(fpack, REQ_POST_POSTUN"coreutils\n");
 //				if ( pkg[i].runfs ) fprintf(fpack, REQ_POST_POSTUN"texlive-kpathsea-bin, tex-kpathsea\n");
 				if ( pkg[i].has_info ) fprintf(fpack, REQ_POST_POSTUN"/sbin/install-info\n");
 				for (n=0; n<pkg[i].reqs; n++) {
@@ -1499,6 +1531,22 @@ 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");
+				}
+				if ( !strcmp(name, "dvipdfmx") ) {	/* rhbz#968358 */
+					fprintf(fpack, "Provides: texlive-dvipdfm = 3:%%{tl_version}\n");
+					fprintf(fpack, "Obsoletes: texlive-dvipdfm < 3:%%{tl_version}\n");
+				}
 				/* description */
 #ifndef SRPMS
 				fprintf(fpack, "\n%%description %s\n", name);
@@ -1514,7 +1562,6 @@ void solve(char *name) {
 				/* preun/post/postun scriptlets */
 				if ( pkg[i].has_info ) {
 					int k;
-
 #ifndef SRPMS
 					fprintf(fpack, "%%preun %s\n", name);
 #else
@@ -1522,8 +1569,8 @@ void solve(char *name) {
 #endif
 					fprintf(fpack, "if [ \"$1\" == \"0\" ]; then\n");
 					for (k=0; k<pkg[i].runfs; k++) {
-						if (!strncmp(pkg[i].runf[k], "texmf/doc/info/", 15)) {
-							fprintf(fpack, "  /sbin/install-info --delete %%{_infodir}/%s %%{_infodir}/dir 2>/dev/null || :\n", &pkg[i].runf[k][15]);
+						if (!strncmp(pkg[i].runf[k], "texmf-dist/doc/info/", 20)) {
+							fprintf(fpack, "  /sbin/install-info --delete %%{_infodir}/%s %%{_infodir}/dir 2>/dev/null || :\n", &pkg[i].runf[k][20]);
 						}
 					}
 					fprintf(fpack, "fi\n\n");
@@ -1540,8 +1587,8 @@ void solve(char *name) {
 						int k;
 
 						for (k=0; k<pkg[i].runfs; k++) {
-							if (!strncmp(pkg[i].runf[k], "texmf/doc/info/", 15)) {
-								fprintf(fpack, "/sbin/install-info %%{_infodir}/%s %%{_infodir}/dir 2>/dev/null\n", &pkg[i].runf[k][15]);
+							if (!strncmp(pkg[i].runf[k], "texmf-dist/doc/info/", 20)) {
+								fprintf(fpack, "/sbin/install-info %%{_infodir}/%s %%{_infodir}/dir 2>/dev/null\n", &pkg[i].runf[k][20]);
 							}
 						}
 					}
@@ -1551,25 +1598,22 @@ void solve(char *name) {
 							continue;
 						}
 						if ( !strncmp(pkg[i].exe[n], "addMap ", 7) ) {
-							fprintf(fpack, "sed -i '/^Map %s/d' %%{_texdir}/texmf/web2c/updmap.cfg\n", &pkg[i].exe[n][7]);
-							fprintf(fpack, "echo \"Map %s\" >> %%{_texdir}/texmf/web2c/updmap.cfg\n", &pkg[i].exe[n][7]);
+							fprintf(fpack, "%%{_bindir}/updmap-sys --quiet --nomkmap --enable Map=%s"REDIR, skipspaces(&pkg[i].exe[n][7]));
 							run_updmap = 1;
 							continue;
 						}
 						if ( !strncmp(pkg[i].exe[n], "addMixedMap ", 12) ) {
-							fprintf(fpack, "sed -i '/^MixedMap %s/d' %%{_texdir}/texmf/web2c/updmap.cfg\n", &pkg[i].exe[n][12]);
-							fprintf(fpack, "echo \"MixedMap %s\" >> %%{_texdir}/texmf/web2c/updmap.cfg\n", &pkg[i].exe[n][12]);
+							fprintf(fpack, "%%{_bindir}/updmap-sys --quiet --nomkmap --enable MixedMap=%s"REDIR, skipspaces(&pkg[i].exe[n][12]));
 							run_updmap = 1;
 							continue;
 						}
 						if ( !strncmp(pkg[i].exe[n], "addKanjiMap ", 12) ) {
-							fprintf(fpack, "sed -i '/^KanjiMap %s/d' %%{_texdir}/texmf/web2c/updmap.cfg\n", &pkg[i].exe[n][12]);
-							fprintf(fpack, "echo \"KanjiMap %s\" >> %%{_texdir}/texmf/web2c/updmap.cfg\n", &pkg[i].exe[n][12]);
+							fprintf(fpack, "%%{_bindir}/updmap-sys --quiet --nomkmap --enable KanjiMap=%s"REDIR, skipspaces(&pkg[i].exe[n][12]));
 							run_updmap = 1;
 							continue;
 						}
 						if ( !strncmp(pkg[i].exe[n], "BuildFormat ", 12) ) {
-							fprintf(fpack, "sed -i 's/^\\#\\!\\ %s/%s/' %%{_texdir}/texmf/web2c/fmtutil.cnf\n", &pkg[i].exe[n][12], &pkg[i].exe[n][12]);
+							fprintf(fpack, "%%{_bindir}/fmtutil-sys --enablefmt %s"REDIR, &pkg[i].exe[n][12]);
 							run_fmtutil = 1;
 							continue;
 						}
@@ -1601,7 +1645,7 @@ void solve(char *name) {
 							opt_char = *opt;
 							*opt = '\0';
 
-							fprintf(fpack, "sed -i 's/^\\#\\!\\ %s.*$/%s %s %s %s/' %%{_texdir}/texmf/web2c/fmtutil.cnf\n", name, name, engine, patterns?patterns:"-", options);
+							fprintf(fpack, "sed -i 's/^\\#\\!\\ %s.*$/%s %s %s %s/' %%{_texdir}/texmf-dist/web2c/fmtutil.cnf\n", name, name, engine, patterns?patterns:"-", options);
 
 							name[strlen(name)] = ' ';
 							engine[strlen(engine)] = ' ';
@@ -1630,33 +1674,33 @@ void solve(char *name) {
 							file += 5;
 							for (k=10; pkg[i].exe[n][k]; k++) if ( pkg[i].exe[n][k] == ' ' ) pkg[i].exe[n][k] = '\0';
 
-							fprintf(fpack, "sed -i '/%s.*/d' %%{_texdir}/texmf/tex/generic/config/language.dat\n", name);
-							fprintf(fpack, "echo \"%s %s\" >> %%{_texdir}/texmf/tex/generic/config/language.dat\n", name, file);
+							fprintf(fpack, "sed -i '/%s.*/d' %%{_texdir}/texmf-dist/tex/generic/config/language.dat\n", name);
+							fprintf(fpack, "echo \"%s %s\" >> %%{_texdir}/texmf-dist/tex/generic/config/language.dat\n", name, file);
 							if ( synonyms ) {
 								char *syn = synonyms, *s;
 								while ( (s=strchr(syn, ',')) ) {
 									*s = '\0';
-									fprintf(fpack, "sed -i '/=%s/d' %%{_texdir}/texmf/tex/generic/config/language.dat\n", syn);
-									fprintf(fpack, "echo \"=%s\" >> %%{_texdir}/texmf/tex/generic/config/language.dat\n", syn);
+									fprintf(fpack, "sed -i '/=%s/d' %%{_texdir}/texmf-dist/tex/generic/config/language.dat\n", syn);
+									fprintf(fpack, "echo \"=%s\" >> %%{_texdir}/texmf-dist/tex/generic/config/language.dat\n", syn);
 									*s = ',';
 									syn = s+1;
 								}
-								fprintf(fpack, "sed -i '/=%s/d' %%{_texdir}/texmf/tex/generic/config/language.dat\n", syn);
-								fprintf(fpack, "echo \"=%s\" >> %%{_texdir}/texmf/tex/generic/config/language.dat\n", syn);
+								fprintf(fpack, "sed -i '/=%s/d' %%{_texdir}/texmf-dist/tex/generic/config/language.dat\n", syn);
+								fprintf(fpack, "echo \"=%s\" >> %%{_texdir}/texmf-dist/tex/generic/config/language.dat\n", syn);
 							}
-							fprintf(fpack, "sed -i '/\\\\addlanguage{%s}.*/d' %%{_texdir}/texmf/tex/generic/config/language.def\n", name);
-							fprintf(fpack, "echo \"\\addlanguage{%s}{%s}{}{%s}{%s}\" >> %%{_texdir}/texmf/tex/generic/config/language.def\n", name, file, lefthyphenmin, righthyphenmin);
+							fprintf(fpack, "sed -i '/\\\\addlanguage{%s}.*/d' %%{_texdir}/texmf-dist/tex/generic/config/language.def\n", name);
+							fprintf(fpack, "echo \"\\addlanguage{%s}{%s}{}{%s}{%s}\" >> %%{_texdir}/texmf-dist/tex/generic/config/language.def\n", name, file, lefthyphenmin, righthyphenmin);
 							if ( synonyms ) {
 								char *syn = synonyms, *s;
 								while ( (s=strchr(syn, ',')) ) {
 									*s = '\0';
-									fprintf(fpack, "sed -i '/\\\\addlanguage{%s}.*/d' %%{_texdir}/texmf/tex/generic/config/language.def\n", syn);
-									fprintf(fpack, "echo \"\\addlanguage{%s}{%s}{}{%s}{%s}\" >> %%{_texdir}/texmf/tex/generic/config/language.def\n", syn, file, lefthyphenmin, righthyphenmin);
+									fprintf(fpack, "sed -i '/\\\\addlanguage{%s}.*/d' %%{_texdir}/texmf-dist/tex/generic/config/language.def\n", syn);
+									fprintf(fpack, "echo \"\\addlanguage{%s}{%s}{}{%s}{%s}\" >> %%{_texdir}/texmf-dist/tex/generic/config/language.def\n", syn, file, lefthyphenmin, righthyphenmin);
 									*s = ',';
 									syn = s+1;
 								}
-								fprintf(fpack, "sed -i '/\\\\addlanguage{%s}.*/d' %%{_texdir}/texmf/tex/generic/config/language.def\n", syn);
-								fprintf(fpack, "echo \"\\addlanguage{%s}{%s}{}{%s}{%s}\" >> %%{_texdir}/texmf/tex/generic/config/language.def\n", syn, file, lefthyphenmin, righthyphenmin);
+								fprintf(fpack, "sed -i '/\\\\addlanguage{%s}.*/d' %%{_texdir}/texmf-dist/tex/generic/config/language.def\n", syn);
+								fprintf(fpack, "echo \"\\addlanguage{%s}{%s}{}{%s}{%s}\" >> %%{_texdir}/texmf-dist/tex/generic/config/language.def\n", syn, file, lefthyphenmin, righthyphenmin);
 							}
 							for (--k; k>=10; k--) if ( pkg[i].exe[n][k] == '\0' ) pkg[i].exe[n][k] = ' ';
 							run_fmtutil = 1;
@@ -1680,22 +1724,22 @@ void solve(char *name) {
 							continue;
 						}
 						if ( !strncmp(pkg[i].exe[n], "addMap ", 7) ) {
-							fprintf(fpack, "sed -i '/^Map %s/d' %%{_texdir}/texmf/web2c/updmap.cfg > /dev/null 2>&1\n", &pkg[i].exe[n][7]);
+							fprintf(fpack, "%%{_bindir}/updmap-sys --nomkmap --disable Map=%s"REDIR, skipspaces(&pkg[i].exe[n][7]));
 							run_updmap = 1;
 							continue;
 						}
 						if ( !strncmp(pkg[i].exe[n], "addMixedMap ", 12) ) {
-							fprintf(fpack, "sed -i '/^MixedMap %s/d' %%{_texdir}/texmf/web2c/updmap.cfg > /dev/null 2>&1\n", &pkg[i].exe[n][12]);
+							fprintf(fpack, "%%{_bindir}/updmap-sys --nomkmap --disable MixedMap=%s"REDIR, skipspaces(&pkg[i].exe[n][12]));
 							run_updmap = 1;
 							continue;
 						}
 						if ( !strncmp(pkg[i].exe[n], "addKanjiMap ", 12) ) {
-							fprintf(fpack, "sed -i '/^KanjiMap %s/d' %%{_texdir}/texmf/web2c/updmap.cfg > /dev/null 2>&1\n", &pkg[i].exe[n][12]);
+							fprintf(fpack, "%%{_bindir}/updmap-sys --nomkmap --disable KanjiMap=%s"REDIR, skipspaces(&pkg[i].exe[n][12]));
 							run_updmap = 1;
 							continue;
 						}
 						if ( !strncmp(pkg[i].exe[n], "BuildFormat ", 12) ) {
-							fprintf(fpack, "sed -i 's/^%s.*$/\\#\\!\\ %s/'  %%{_texdir}/texmf/web2c/fmtutil.cnf > /dev/null 2>&1\n", &pkg[i].exe[n][12], &pkg[i].exe[n][12]);
+							fprintf(fpack, "%%{_bindir}/fmtutil-sys --disablefmt %s"REDIR, &pkg[i].exe[n][12]);
 							run_fmtutil = 1;
 							continue;
 						}
@@ -1727,7 +1771,7 @@ void solve(char *name) {
 							opt_char = *opt;
 							*opt = '\0';
 
-							fprintf(fpack, "sed -i 's/^%s.*$/\\#\\!\\ %s %s %s %s/' %%{_texdir}/texmf/web2c/fmtutil.cnf > /dev/null 2>&1\n", name, name, engine, patterns?patterns:"-", options);
+							fprintf(fpack, "sed -i 's/^%s.*$/\\#\\!\\ %s %s %s %s/' %%{_texdir}/texmf-dist/web2c/fmtutil.cnf"REDIR, name, name, engine, patterns?patterns:"-", options);
 
 							name[strlen(name)] = ' ';
 							engine[strlen(engine)] = ' ';
@@ -1756,27 +1800,27 @@ void solve(char *name) {
 							file += 5;
 							for (k=10; pkg[i].exe[n][k]; k++) if ( pkg[i].exe[n][k] == ' ' ) pkg[i].exe[n][k] = '\0';
 
-							fprintf(fpack, "sed -i '/%s.*/d' %%{_texdir}/texmf/tex/generic/config/language.dat > /dev/null 2>&1\n", name);
+							fprintf(fpack, "sed -i '/%s.*/d' %%{_texdir}/texmf-dist/tex/generic/config/language.dat"REDIR, name);
 							if ( synonyms ) {
 								char *syn = synonyms, *s;
 								while ( (s=strchr(syn, ',')) ) {
 									*s = '\0';
-									fprintf(fpack, "  sed -i '/=%s/d' %%{_texdir}/texmf/tex/generic/config/language.dat > /dev/null 2>&1\n", syn);
+									fprintf(fpack, "  sed -i '/=%s/d' %%{_texdir}/texmf-dist/tex/generic/config/language.dat"REDIR, syn);
 									*s = ',';
 									syn = s+1;
 								}
-								fprintf(fpack, "  sed -i '/=%s/d' %%{_texdir}/texmf/tex/generic/config/language.dat > /dev/null 2>&1\n", syn);
+								fprintf(fpack, "  sed -i '/=%s/d' %%{_texdir}/texmf-dist/tex/generic/config/language.dat"REDIR, syn);
 							}
-							fprintf(fpack, "sed -i '/\\\\addlanguage{%s}.*/d' %%{_texdir}/texmf/tex/generic/config/language.def > /dev/null 2>&1\n", name);
+							fprintf(fpack, "sed -i '/\\\\addlanguage{%s}.*/d' %%{_texdir}/texmf-dist/tex/generic/config/language.def"REDIR, name);
 							if ( synonyms ) {
 								char *syn = synonyms, *s;
 								while ( (s=strchr(syn, ',')) ) {
 									*s = '\0';
-									fprintf(fpack, "sed -i '/\\\\addlanguage{%s}.*/d' %%{_texdir}/texmf/tex/generic/config/language.def > /dev/null 2>&1\n", syn);
+									fprintf(fpack, "sed -i '/\\\\addlanguage{%s}.*/d' %%{_texdir}/texmf-dist/tex/generic/config/language.def"REDIR, syn);
 									*s = ',';
 									syn = s+1;
 								}
-								fprintf(fpack, "sed -i '/\\\\addlanguage{%s}.*/d' %%{_texdir}/texmf/tex/generic/config/language.def > /dev/null 2>&1\n", syn);
+								fprintf(fpack, "sed -i '/\\\\addlanguage{%s}.*/d' %%{_texdir}/texmf-dist/tex/generic/config/language.def"REDIR, syn);
 							}
 							for (--k; k>=10; k--) if ( pkg[i].exe[n][k] == '\0' ) pkg[i].exe[n][k] = ' ';
 							run_fmtutil = 1;
@@ -1793,9 +1837,9 @@ void solve(char *name) {
 					fprintf(fpack, "%%posttrans\n");
 #endif
 					fprintf(fpack, "if [ -e /var/run/texlive/run-texhash ]; then %%{_bindir}/texhash 2> /dev/null; rm -f /var/run/texlive/run-texhash; fi\n");
-					if ( run_updmap ) fprintf(fpack, "if [ -e /var/run/texlive/run-updmap ]; then %%{_bindir}/updmap-sys --syncwithtrees --nohash --quiet &> /dev/null; rm -f /var/run/texlive/run-updmap; fi\n");
+					if ( run_updmap ) fprintf(fpack, "if [ -e /var/run/texlive/run-updmap ]; then %%{_bindir}/updmap-sys --quiet --nomkmap &> /dev/null;rm -f /var/run/texlive/run-updmap; fi\n");
 					if ( run_fmtutil ) fprintf(fpack, "if [ -e /var/run/texlive/run-fmtutil ]; then %%{_bindir}/fmtutil-sys --all &> /dev/null; rm -f /var/run/texlive/run-fmtutil; fi\n");
-					fprintf(fpack, "if [ -e /var/run/texlive/run-mtxrun ]; then export TEXMF=/usr/share/texlive/texmf-dist; export TEXMFCNF=/usr/share/texlive/texmf/web2c; export TEXMFCACHE=/var/lib/texmf; %%{_bindir}/mtxrun --generate &> /dev/null; rm -f /var/run/texlive/run-mtxrun; fi\n");
+					fprintf(fpack, "if [ -e /var/run/texlive/run-mtxrun ]; then export TEXMF=/usr/share/texlive/texmf-dist; export TEXMFCNF=/usr/share/texlive/texmf-dist/web2c; export TEXMFCACHE=/var/lib/texmf; %%{_bindir}/mtxrun --generate &> /dev/null; rm -f /var/run/texlive/run-mtxrun; fi\n");
 					fprintf(fpack, ":\n\n");
 				} else if ( pkg[i].runfs ) {
 #ifndef SRPMS
@@ -1808,8 +1852,8 @@ void solve(char *name) {
 						int k;
 
 						for (k=0; k<pkg[i].runfs; k++) {
-							if (!strncmp(pkg[i].runf[k], "texmf/doc/info/", 15)) {
-								fprintf(fpack, "/sbin/install-info %%{_infodir}/%s %%{_infodir}/dir 2>/dev/null\n", &pkg[i].runf[k][15]);
+							if (!strncmp(pkg[i].runf[k], "texmf-dist/doc/info/", 20)) {
+								fprintf(fpack, "/sbin/install-info %%{_infodir}/%s %%{_infodir}/dir 2>/dev/null\n", &pkg[i].runf[k][20]);
 							}
 						}
 					}
@@ -1827,7 +1871,7 @@ void solve(char *name) {
 					fprintf(fpack, "%%posttrans\n");
 #endif
 					fprintf(fpack, "if [ -e /var/run/texlive/run-texhash ] && [ -e %%{_bindir}/texhash ]; then %%{_bindir}/texhash 2> /dev/null; rm -f /var/run/texlive/run-texhash; fi\n");
-					fprintf(fpack, "if [ -e /var/run/texlive/run-mtxrun ]; then export TEXMF=/usr/share/texlive/texmf-dist; export TEXMFCNF=/usr/share/texlive/texmf/web2c; export TEXMFCACHE=/var/lib/texmf; %%{_bindir}/mtxrun --generate &> /dev/null; rm -f /var/run/texlive/run-mtxrun; fi\n");
+					fprintf(fpack, "if [ -e /var/run/texlive/run-mtxrun ]; then export TEXMF=/usr/share/texlive/texmf-dist; export TEXMFCNF=/usr/share/texlive/texmf-dist/web2c; export TEXMFCACHE=/var/lib/texmf; %%{_bindir}/mtxrun --generate &> /dev/null; rm -f /var/run/texlive/run-mtxrun; fi\n");
 					fprintf(fpack, ":\n\n");
 				}
 
@@ -1835,15 +1879,16 @@ void solve(char *name) {
 #ifdef SRPMS
 				mainpkg = 1;
 #endif
+				main_written = 0;
 				append_filelist(pkg[i].name, "", pkg[i].runfs, pkg[i].runf, pkg[i].fedora_license?pkg[i].fedora_license:put_token(pkg[i].catalogue_license, license));
 #ifdef SRPMS
 				mainpkg = 0;
 #endif
 			}
+			main_written = pkg[i].runfs || pkg[i].reqs || pkg[i].exes;
 #ifdef PACKAGE_DOCS
 			/* write doc package if exists */
 			if ( pkg[i].docfs ) {
-				main_written = pkg[i].runfs || pkg[i].reqs || pkg[i].exes;
 				if ( !doc_expanded ) {
 					fprintf(funpack, UNPACK" -dc %%{SOURCE%d} | tar x -C %%{buildroot}%%{_texdir}%s\n", srcno, pkg[i].reloc?"/texmf-dist":"");
 					fprintf(fsrc, "Source%04d: "CTAN_URL"%s.doc.tar."UNPACK"\n", srcno++, name);
@@ -2009,11 +2054,11 @@ void solve(char *name) {
 #ifdef SRPMS
 			if (pkg[i].has_man) {
 				fprintf(fremove, "mkdir -p %%{buildroot}/%%{_datadir}/\n");
-				fprintf(fremove, "mv %%{buildroot}/%%{_texdir}/texmf/doc/man %%{buildroot}/%%{_datadir}/\n");
+				fprintf(fremove, "mv %%{buildroot}/%%{_texdir}/texmf-dist/doc/man %%{buildroot}/%%{_datadir}/\n");
 			}
 			if (pkg[i].has_info) {
 				fprintf(fremove, "mkdir -p %%{buildroot}/%%{_infodir}/\n");
-				fprintf(fremove, "mv %%{buildroot}/%%{_texdir}/texmf/doc/info/* %%{buildroot}/%%{_infodir}/\n");
+				fprintf(fremove, "mv %%{buildroot}/%%{_texdir}/texmf-dist/doc/info/* %%{buildroot}/%%{_infodir}/\n");
 			}
 #endif
 #ifdef SRPMS
@@ -2033,27 +2078,23 @@ void solve(char *name) {
 				ffont = offont;
 			}
 #endif
-			if ( pkg[i].binfs ) {
+			if ( pkg[i].binfs && (has_noarch_pkg || pkg[i].binfs > 1) ) {
 				char *ar = strstr(name, ".ARCH");
 				*ar = '\0';
 				fprintf(fpack, "%%package %s-bin\n", name);
 				fprintf(fpack, "Summary: Binaries for %s\n", name);
 				fprintf(fpack, "Version: %s\n", print_noarch_version(&pkg[i]));
-				if ( strncmp(name, "kpathsea", 8) ) fprintf(fpack, "Requires: texlive-base\n"); //else fprintf(fpack, "Provides: kpathsea = %%{tl_version}\nObsoletes: kpathsea < %%{tl_version}\n");
-				fprintf(fpack, "Requires: tex-%s\n", name);
+				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");
 					fprintf(fpack, "Obsoletes: xdvipdfmx < %%{version}-%%{release}\n");
 				}
-				if ( !strcmp(name, "dvipdfm") ) {
-					fprintf(fpack, "Provides: dvipdfm = %%{tl_version}\n");
-					fprintf(fpack, "Obsoletes: dvipdfm < %%{tl_version}\n");
-				}
 				if ( !strcmp(name, "dvipdfmx") ) {
-					fprintf(fpack, "Provides: dvipdfmx = %%{tl_version}\n");
-					fprintf(fpack, "Obsoletes: dvipdfmx < %%{tl_version}\n");
+					fprintf(fpack, "Provides: dvipdfmx = %%{tl_version}, dvipdfm = %%{tl_version}, texlive-dvipdfm-bin = 3:%%{tl_version}\n");
+					fprintf(fpack, "Obsoletes: dvipdfmx < %%{tl_version}, dvipdfm < %%{tl_version}, texlive-dvipdfm-bin < 3:%%{tl_version}\n");
 				}
 				if ( !strcmp(name, "xdvi") ) {
 					fprintf(fpack, "Provides: xdvi = %%{tl_version}, xdvik = %%{tl_version}, tetex-xdvi = 3.1-99\n");
@@ -2063,6 +2104,9 @@ void solve(char *name) {
 					fprintf(fpack, "Provides: dvipng = %%{tl_version}\n");
 					fprintf(fpack, "Obsoletes: dvipng < %%{tl_version}\n");
 				}
+				if ( !strcmp(name, "pdfcrop") ) {
+					fprintf(fpack, "Requires: ghostscript-devel\n");
+				}
 				if ( !strcmp(name, "dvisvgm") ) {
 					fprintf(fpack, "Provides: dvisvgm = %%{tl_version}\n");
 					fprintf(fpack, "Obsoletes: dvisvgm < %%{tl_version}\n");

tlpdb.patch

@@ -1,5 +1,5 @@
---- texlive.tlpdb.orig	2013-03-05 15:10:02.769657427 +0100
-+++ texlive.tlpdb	2013-03-06 10:07:42.527218930 +0100
+--- texlive.tlpdb.orig	2013-10-19 10:20:04.822855328 +0200
++++ texlive.tlpdb	2013-10-19 10:20:04.970855716 +0200
 @@ -76,7 +76,7 @@
  catalogue-ctan /macros/latex/contrib/abc
  catalogue-date 2008-03-08 20:47:21 +0100
@@ -9,22 +9,22 @@
  
  name abntex2
  category Package
-@@ -7172,7 +7172,7 @@
+@@ -7272,7 +7272,7 @@
  catalogue-license pd
  catalogue-version 1.0a
  
 -name Asana-Math
 +name asana-math
  category Package
- revision 27228
+ revision 31750
  shortdesc A font to typeset maths in Xe(La)TeX and Lua(La)TeX.
-@@ -11092,38 +11092,6 @@
+@@ -11812,38 +11812,6 @@
  catalogue-date 2006-12-29 13:11:21 +0100
  catalogue-license gpl
  
 -name biber
 -category Package
--revision 28798
+-revision 31187
 -shortdesc A BibTeX replacement for users of biblatex.
 -longdesc Biber is a BibTeX replacement for users of biblatex. Biber
 -longdesc supports full UTF-8, can (re)-encode input and output, supports
@@ -36,63 +36,54 @@
 -longdesc from an earlier (now apparently moribund) project called
 -longdesc "biber".
 -depend biber.ARCH
--docfiles size=72
+-docfiles size=86
 - texmf-dist/doc/bibtex/biber/biber.pdf
--srcfiles size=515
+-srcfiles size=538
 - texmf-dist/source/bibtex/biber/Changes
 - texmf-dist/source/bibtex/biber/biblatex-biber.tar.gz
 - texmf-dist/source/bibtex/biber/utf8-macro-map.html
 -catalogue-ctan /biblio/biber
--catalogue-date 2013-01-11 10:45:05 +0100
+-catalogue-date 2013-07-10 20:36:51 +0200
 -catalogue-license artistic
--catalogue-version 1.5
+-catalogue-version 1.7
 -
 -name biber.i386-linux
 -category Package
--revision 28798
+-revision 31175
 -shortdesc i386-linux files of biber
--binfiles arch=i386-linux size=3092
+-binfiles arch=i386-linux size=4313
 - bin/i386-linux/biber
 -
  name bibexport
  category Package
- revision 26313
-@@ -25109,7 +25077,6 @@
- shortdesc TeX Live documentation
- relocated 1
+ revision 29349
+@@ -25878,7 +25846,6 @@
+ depend tex
+ depend texconfig
  depend texlive-common
 -depend texlive-docindex
  depend texlive-en
- 
- name collection-documentation-bulgarian
-@@ -25407,7 +25374,7 @@
- revision 29280
- shortdesc Extra fonts
+ depend texlive-msg-translations
+ depend texlive-scripts
+@@ -26094,7 +26061,7 @@
+ shortdesc Additional fonts
  relocated 1
+ depend collection-basic
 -depend Asana-Math
 +depend asana-math
  depend adforn
  depend adfsymbols
  depend aecc
-@@ -25527,7 +25494,7 @@
- depend libertine
+@@ -26218,7 +26185,7 @@
  depend librebaskerville
+ depend librecaslon
  depend libris
 -depend linearA
 +depend lineara
  depend lxfonts
  depend ly1
  depend mathabx
-@@ -25892,7 +25859,7 @@
- depend cns
- depend ctex
- depend dnp
--depend fonts-tlwg
-+depend tlwg
- depend garuda-c90
- depend hyphen-chinese
- depend ipaex
-@@ -27435,7 +27402,7 @@
+@@ -28257,7 +28224,7 @@
  depend m-tx
  depend musixguit
  depend musixtex
@@ -100,10 +91,10 @@
 +depend musixtex-fnts
  depend pmx
  depend songbook
- depend collection-latex
-@@ -27886,25 +27853,6 @@
- depend texinfo
- depend collection-basic
+ depend songs
+@@ -28719,25 +28686,6 @@
+ depend unitsdef
+ depend youngtab
  
 -name collection-texworks
 -category Collection
@@ -116,8 +107,8 @@
 -
 -name collection-wintools
 -category Collection
--revision 13822
--shortdesc Windows support programs
+-revision 30307
+-shortdesc Windows-only support programs
 -relocated 1
 -longdesc Utilities for Windows, since they are not readily available
 -longdesc there: chktex, unzip, wget, xpdf, and the dviout previewer.
@@ -126,8 +117,8 @@
 -
  name collection-xetex
  category Collection
- revision 28847
-@@ -36530,7 +36478,7 @@
+ revision 30396
+@@ -37651,7 +37599,7 @@
   texmf-dist/source/support/dosepsbin/install-sh
  catalogue-ctan /support/dosepsbin
  catalogue-date 2012-03-22 21:51:23 +0100
@@ -136,18 +127,9 @@
  catalogue-version 1.2
  
  name dosepsbin.i386-linux
-@@ -50063,7 +50011,7 @@
- catalogue-license lppl1.3
- catalogue-version v2.3
- 
--name fonts-tlwg
-+name tlwg
- category Package
- revision 29235
- shortdesc Thai fonts for LaTeX from TLWG.
-@@ -61148,13 +61096,6 @@
+@@ -63763,13 +63711,6 @@
  catalogue-license lppl
- catalogue-version v1.6b
+ catalogue-version v1.7
  
 -name installfont.i386-linux
 -category Package
@@ -159,7 +141,15 @@
  name interactiveworkbook
  category Package
  revision 15878
-@@ -70290,7 +70231,7 @@
+@@ -66248,7 +66189,6 @@
+ longdesc The package contains pLaTeX support files and virtual fonts for
+ longdesc supporting a wide variety of fonts in LaTeX using the pTeX
+ longdesc engine.
+-execute addKanjiMap otf-cktx.map
+ execute addKanjiMap otf-@kanjiEmbed@.map
+ runfiles size=31495
+  RELOC/fonts/map/dvipdfmx/japanese-otf/otf-cktx.map
+@@ -74274,7 +74214,7 @@
  catalogue-ctan /macros/latex/contrib/labels
  catalogue-date 2009-09-29 00:01:21 +0200
  catalogue-license lppl1.2
@@ -168,13 +158,13 @@
  
  name lacheck
  category TLCore
-@@ -71505,68 +71446,6 @@
+@@ -75535,71 +75475,6 @@
  catalogue-license lppl
  catalogue-version 1.13
  
 -name latexmk
 -category Package
--revision 28264
+-revision 31087
 -shortdesc Fully automated LaTeX document generation.
 -longdesc Latexmk completely automates the process of generating a LaTeX
 -longdesc document. Given the source files for a document, latexmk issues
@@ -186,9 +176,11 @@
 -longdesc changed. Thus a previewer can have an updated display whenever
 -longdesc the source files change.
 -depend latexmk.ARCH
--runfiles size=78
+-runfiles size=80
 - texmf-dist/scripts/latexmk/latexmk.pl
--docfiles size=167
+-docfiles size=177
+- texmf-dist/doc/man/man1/latexmk.1
+- texmf-dist/doc/man/man1/latexmk.man1.pdf
 - texmf-dist/doc/support/latexmk/CHANGES
 - texmf-dist/doc/support/latexmk/COPYING
 - texmf-dist/doc/support/latexmk/INSTALL
@@ -197,9 +189,12 @@
 - texmf-dist/doc/support/latexmk/example_rcfiles/Sweave_latexmkrc
 - texmf-dist/doc/support/latexmk/example_rcfiles/TeX4ht-latexmkrc
 - texmf-dist/doc/support/latexmk/example_rcfiles/asymptote_latexmkrc
+- texmf-dist/doc/support/latexmk/example_rcfiles/exceltex_latexmkrc
 - texmf-dist/doc/support/latexmk/example_rcfiles/glossary_latexmkrc
+- texmf-dist/doc/support/latexmk/example_rcfiles/lualatex_latexmkrc
 - texmf-dist/doc/support/latexmk/example_rcfiles/mpost_latexmkrc
 - texmf-dist/doc/support/latexmk/example_rcfiles/pdflatexmkrc
+- texmf-dist/doc/support/latexmk/example_rcfiles/pythontex-latexmkrc
 - texmf-dist/doc/support/latexmk/example_rcfiles/sagetex_latexmkrc
 - texmf-dist/doc/support/latexmk/example_rcfiles/sweave_latexmkrc
 - texmf-dist/doc/support/latexmk/example_rcfiles/xelatex_latexmkrc
@@ -218,14 +213,12 @@
 - texmf-dist/doc/support/latexmk/extra-scripts/startacroread
 - texmf-dist/doc/support/latexmk/latexmk.pdf
 - texmf-dist/doc/support/latexmk/latexmk.txt
-- texmf/doc/man/man1/latexmk.1
-- texmf/doc/man/man1/latexmk.man1.pdf
 -srcfiles size=1
 - texmf-dist/source/support/latexmk/latexmk.bat
 -catalogue-ctan /support/latexmk
--catalogue-date 2012-08-20 08:32:37 +0200
+-catalogue-date 2012-11-17 01:32:51 +0100
 -catalogue-license gpl
--catalogue-version 4.33c
+-catalogue-version 4.35
 -
 -name latexmk.i386-linux
 -category Package
@@ -237,7 +230,7 @@
  name latexmp
  category Package
  revision 15878
-@@ -76425,7 +76304,7 @@
+@@ -80947,7 +80822,7 @@
  catalogue-date 2007-01-08 23:14:30 +0100
  catalogue-license lppl
  
@@ -246,16 +239,7 @@
  category Package
  revision 15878
  shortdesc Linear A script fonts.
-@@ -78710,7 +78589,7 @@
- catalogue-ctan /info/lshort/persian
- catalogue-date 2009-11-09 23:05:00 +0100
- catalogue-license pd
--catalogue-version 4.26:2009-08-04
-+catalogue-version 4.26-2009-08-04
- 
- name lshort-polish
- category Package
-@@ -86116,7 +85995,7 @@
+@@ -91555,7 +91430,7 @@
   texmf-dist/source/generic/mkjobtexmf/install-sh
  catalogue-ctan /support/mkjobtexmf
  catalogue-date 2011-11-16 11:07:17 +0100
@@ -264,7 +248,7 @@
  catalogue-version 0.8
  
  name mkjobtexmf.i386-linux
-@@ -88109,7 +87988,7 @@
+@@ -93616,7 +93491,7 @@
  catalogue-license lppl1.3
  catalogue-version 1.2.2
  
@@ -273,71 +257,34 @@
  category Package
  revision 28934
  shortdesc Fonts used by MusixTeX.
-@@ -104129,7 +104008,7 @@
+@@ -111215,7 +111090,7 @@
  catalogue-ctan /graphics/pstricks/contrib/pst-layout
- catalogue-date 2011-05-27 12:35:46 +0200
+ catalogue-date 2012-04-27 12:45:13 +0200
  catalogue-license lppl
 -catalogue-version .95
 +catalogue-version 95
  
  name pst-lens
  category Package
-@@ -120346,30 +120225,30 @@
- 
- name tableof
- category Package
--revision 29046
-+revision 29296
- shortdesc Tagging tables of contents.
- relocated 1
--longdesc The package allows the author to tag entries in the table of
--longdesc contents, and to select entries based on the tags. The
--longdesc \tableof{comma,separated,list,of,tags} command displays a table
--longdesc of contents containing only the entries having all the listed
--longdesc tags. There is a complementary command \tablenotof. The
--longdesc commands may be used multiple times. Tags are set in the source
--longdesc with the command \toftagstart, and are unset with \toftagstop;
--longdesc for a single entry, \toftagthis, sets tags for the next entry,
--longdesc and \tofuntagthis unset tags.
-+longdesc The package provides the commands to flag chapters or sections
-+longdesc (or anything else destined to become a TOC line). The command
-+longdesc \nexttocwithtags{req1,req2,...}{excl1,excl2,...} specifies
-+longdesc which tags are to be required and which ones are to be excluded
-+longdesc by the next \tableofcontents (or equivalent) command. In a
-+longdesc document that uses a class where \tableofcontents may only be
-+longdesc used once, the command
-+longdesc \tableoftaggedcontents{req1,req2,...}{excl1,excl2,...} may be
-+longdesc used to provide several tables.
- runfiles size=2
-  RELOC/tex/latex/tableof/tableof.sty
--docfiles size=21
-+docfiles size=12
-  RELOC/doc/latex/tableof/README
-  RELOC/doc/latex/tableof/tableof.pdf
--srcfiles size=7
-+srcfiles size=8
-  RELOC/source/latex/tableof/tableof.dtx
-  RELOC/source/latex/tableof/tableof.ins
- catalogue-ctan /macros/latex/contrib/tableof
--catalogue-date 2012-12-21 17:35:00 +0100
-+catalogue-date 2013-03-05 14:09:10 +0100
- catalogue-license lppl
--catalogue-version 1.1
-+catalogue-version 1.2
- 
- name tablists
- category Package
-@@ -121986,7 +121865,7 @@
-  texmf/doc/man/man1/texdiff.man1.pdf
- catalogue-ctan /support/texdiff
- catalogue-date 2009-11-10 00:58:07 +0100
--catalogue-license artistic
-+catalogue-license gpl
- catalogue-version 0.4
- 
- name texdiff.i386-linux
-@@ -122013,7 +121892,7 @@
-  texmf/doc/man/man1/texdirflatten.man1.pdf
+@@ -117345,7 +117220,6 @@
+ execute AddFormat name=eptex  engine=eptex options="*eptex.ini"                               patterns=language.def
+ execute AddFormat name=platex engine=eptex options="*platex.ini"                               patterns=language.dat
+ execute addKanjiMap ptex-@kanjiEmbed@@kanjiVariant@.map
+-execute addKanjiMap morisawa.map
+ runfiles size=2485
+  texmf-dist/fonts/map/dvipdfmx/ptex/morisawa.map
+  texmf-dist/fonts/source/ptex/ascgrp/ascgrp.mf
+@@ -123608,7 +123482,7 @@
+ depend kurier
+ depend poltawski
+ depend xits
+-depend Asana-Math
++depend asana-math
+ depend txfonts
+ depend pxfonts
+ depend eulervm
+@@ -130806,7 +130680,7 @@
+  texmf-dist/doc/man/man1/texdirflatten.man1.pdf
  catalogue-ctan /support/texdirflatten
  catalogue-date 2012-01-12 19:29:56 +0100
 -catalogue-license artistic
@@ -345,24 +292,15 @@
  catalogue-version 1.1
  
  name texdirflatten.i386-linux
-@@ -123280,7 +123159,7 @@
- 
- name texlive-docindex
- category TLCore
--revision 29284
-+revision 29293
- shortdesc top-level TeX Live doc.html, etc.
- longdesc These files are regenerated as needed, which is often, so we
- longdesc make them a separate package.  See the tl-update-auto script
-@@ -123554,7 +123433,6 @@
- revision 13663
+@@ -132354,7 +132228,6 @@
+ revision 29741
  shortdesc i386-linux files of texlive-scripts
  binfiles arch=i386-linux size=2
 - bin/i386-linux/man
   bin/i386-linux/rungs
  
  name texlive-sr
-@@ -132724,7 +132602,7 @@
+@@ -141596,7 +141469,7 @@
  catalogue-ctan /macros/latex209/contrib/trees/tree-dvips
  catalogue-date 2011-03-14 14:09:23 +0100
  catalogue-license lppl1
@@ -371,10 +309,10 @@
  
  name treetex
  category Package
-@@ -144162,7 +144040,6 @@
- revision 26912
+@@ -153730,7 +153603,6 @@
+ revision 30845
  shortdesc i386-linux files of xetex
- binfiles arch=i386-linux size=4837
+ binfiles arch=i386-linux size=5465
 - bin/i386-linux/teckit_compile
   bin/i386-linux/xdvipdfmx
   bin/i386-linux/xelatex