[texlive] Fix symlinks pointing to system utilities (#907643)

[Jindrich Novy]

commit fb7b0cdda3bb42ef6a011f68aa8bc8336d21a8ac
Author: Jindrich Novy <jnovy at redhat.com>
Date:   Tue Feb 5 22:55:51 2013 +0100

    Fix symlinks pointing to system utilities (#907643)

 .gitignore            |    2 +-
 sources               |    2 +-
 texlive.spec          |   27 ++++++++++++++++++++++++---
 texlive.spec.template |   27 ++++++++++++++++++++++++---
 4 files changed, 50 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c3b7dc3..3c2224c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4951,7 +4951,7 @@
 /texlive-scripts.tar.xz
 /texlive-sr.doc.tar.xz
 /texlive-zh-cn.doc.tar.xz
-/texlive-20130202_r29008-source.tar.xz
+/texlive-20130205_r29034-source.tar.xz
 /texloganalyser.doc.tar.xz
 /texloganalyser.i386-linux.tar.xz
 /texloganalyser.tar.xz
diff --git a/sources b/sources
index 12843f1..fb6f924 100644
--- a/sources
+++ b/sources
@@ -4951,7 +4951,7 @@ ecc177d9e0d734653473a6c0d7a0c638  texlive-scripts.doc.tar.xz
 335f2d902c215e7265a204b63f656753  texlive-scripts.tar.xz
 3065bdeeddd6f40e3eb0f642f9a60a2d  texlive-sr.doc.tar.xz
 97b2789c4d61ae06a032869209990213  texlive-zh-cn.doc.tar.xz
-24dcaba6fab1f1e22b7a930eff3fce5e  texlive-20130202_r29008-source.tar.xz
+aafb74351dd6c04bf2f122963d534777  texlive-20130205_r29034-source.tar.xz
 dd61bb4c5e070a47a96149d9e2e21445  texloganalyser.doc.tar.xz
 b9a82dd58b5f132bae570c57a11db4aa  texloganalyser.i386-linux.tar.xz
 9c5b6a7021b601df4285d02bba729d0d  texloganalyser.tar.xz
diff --git a/texlive.spec b/texlive.spec
index bcec6dc..843a248 100644
--- a/texlive.spec
+++ b/texlive.spec
@@ -1,6 +1,6 @@
-%global source_date 20130202_r29008
+%global source_date 20130205_r29034
 %global tl_version 2012
-%global tl_rel 15
+%global tl_rel 16
 %global tl_release %{tl_rel}.%{source_date}%{?dist}
 %global tl_noarch_release %{tl_rel}%{?dist}
 %global source_name texlive-%{source_date}-source
@@ -186138,12 +186138,30 @@ 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 ltxfileinfo; do
+for i in physe phyzzx installfont-tl pdfthumb ppower4 tcdialog latexmk ltxfileinfo dtxgen; do
 rm -f %{buildroot}%{_bindir}/$i
 done
 rm -rf %{buildroot}%{_includedir}/ptexenc
 popd
 
+# fix symlinks
+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
+done
+for i in texdoctk updmap e2pall; do
+rm -f $i
+ln -s /usr/share/texlive/texmf-dist/scripts/tetex/$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
+done
+rm -f mkjobtexmf
+ln -s /usr/share/texlive/texmf-dist/scripts/mkjobtexmf/mkjobtexmf.pl mkjobtexmf
+popd
+
 # remove all unshipped stuff
 rm -f %{buildroot}/%{_texdir}/texmf/doc/info/kpathsea.info
 
@@ -309648,6 +309666,9 @@ fi
 %{_libdir}/*.so
 
 %changelog
+* Tue Feb  5 2013 Jindrich Novy <jnovy at redhat.com> 2012-16-20130205
+- fix symlinks pointing to system utilities (#907643)
+
 * Mon Jan 28 2013 Jindrich Novy <jnovy at redhat.com> 2012-15-20130131
 - enlarge tex(latex) dependency set, introduce tex(latex-base) (#904147)
 - fix post-scriptlets (#875257)
diff --git a/texlive.spec.template b/texlive.spec.template
index b16a72e..5ecf98e 100644
--- a/texlive.spec.template
+++ b/texlive.spec.template
@@ -1,6 +1,6 @@
-%global source_date 20130202_r29008
+%global source_date 20130205_r29034
 %global tl_version 2012
-%global tl_rel 15
+%global tl_rel 16
 %global tl_release %{tl_rel}.%{source_date}%{?dist}
 %global tl_noarch_release %{tl_rel}%{?dist}
 %global source_name texlive-%{source_date}-source
@@ -222,12 +222,30 @@ 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 ltxfileinfo; do
+for i in physe phyzzx installfont-tl pdfthumb ppower4 tcdialog latexmk ltxfileinfo dtxgen; do
 	rm -f %{buildroot}%{_bindir}/$i
 done
 rm -rf %{buildroot}%{_includedir}/ptexenc
 popd
 
+# fix symlinks
+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
+done
+for i in texdoctk updmap e2pall; do
+	rm -f $i
+	ln -s /usr/share/texlive/texmf-dist/scripts/tetex/$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
+done
+rm -f mkjobtexmf
+ln -s /usr/share/texlive/texmf-dist/scripts/mkjobtexmf/mkjobtexmf.pl mkjobtexmf
+popd
+
 # remove all unshipped stuff
 %include _remove.spec
 mkdir -p %{buildroot}/%{_datadir}/
@@ -321,6 +339,9 @@ fi
 %{_libdir}/*.so
 
 %changelog
+* Tue Feb  5 2013 Jindrich Novy <jnovy at redhat.com> 2012-16-20130205
+- fix symlinks pointing to system utilities (#907643)
+
 * Mon Jan 28 2013 Jindrich Novy <jnovy at redhat.com> 2012-15-20130131
 - enlarge tex(latex) dependency set, introduce tex(latex-base) (#904147)
 - fix post-scriptlets (#875257)