Avouid conflict with rungs(.tlu)

OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=369

source-ppc64.dif

@@ -0,0 +1,40 @@
+---
+ libs/luajit/configure       |    9 +++++++++
+ libs/luajit/m4/lj-system.m4 |    8 +++++++-
+ 2 files changed, 16 insertions(+), 1 deletion(-)
+
+--- libs/luajit/configure
++++ libs/luajit/configure	2020-04-30 15:42:15.998038368 +0000
+@@ -14300,6 +14300,15 @@ fi
+ fi
+                 if test "x$LJHOST" = xPS3; then :
+   echo '-D PPE -D TOC' >>dynasm_flags
++fi
++                if grep 'LJ_ARCH_PPC_OPD 1' conftest.i >/dev/null 2>&1; then :
++  echo '-D OPD' >>dynasm_flags
++fi
++                if grep 'LJ_ARCH_PPC_OPDENV 1' conftest.i >/dev/null 2>&1; then :
++  echo '-D OPDENV' >>dynasm_flags
++fi
++                if grep 'LJ_ARCH_PPC_ELFV2 1' conftest.i >/dev/null 2>&1; then :
++  echo '-D ELFV2' >>dynasm_flags
+ fi ;; #(
+   *) :
+      ;;
+--- libs/luajit/m4/lj-system.m4
++++ libs/luajit/m4/lj-system.m4	2020-04-30 15:42:03.782274022 +0000
+@@ -87,7 +87,13 @@ AS_CASE([$LJARCH],
+                 AS_IF([grep 'LJ_ARCH_PPC64 ' conftest.i >/dev/null 2>&1],
+                       [DASM_ARCH=ppc64])
+                 AS_IF([test "x$LJHOST" = xPS3],
+-                      [echo '-D PPE -D TOC' >>dynasm_flags])])
++                      [echo '-D PPE -D TOC' >>dynasm_flags])
++                AS_IF([grep 'LJ_ARCH_PPC_OPD 1' conftest.i >/dev/null 2>&1],
++                      [echo '-D OPD' >>dynasm_flags])
++                AS_IF([grep 'LJ_ARCH_PPC_OPDENV 1' conftest.i >/dev/null 2>&1],
++                      [echo '-D OPDENV' >>dynasm_flags])
++                AS_IF([grep 'LJ_ARCH_PPC_ELFV2 1' conftest.i >/dev/null 2>&1],
++                      [echo '-D ELFV2' >>dynasm_flags])])
+ 
+ AS_IF([test "x$build" != "x$host"],
+  [AS_CASE([$LJHOST],

texlive.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue May  5 09:01:14 UTC 2020 - Dr. Werner Fink <werner@suse.de>
+
+- Add patch source-ppc64.dif to get ppc64 acrch to work
+  (nevertheless ppc64 is currently disabled)
+
+-------------------------------------------------------------------
+Tue May  5 08:56:04 UTC 2020 - Dr. Werner Fink <werner@suse.de>
+
+- Avouid conflict with rungs(.tlu) seeing twice in texlive-scripts
+  and texlive-dvipdfmx-bin
+
 -------------------------------------------------------------------
 Wed Apr 29 09:56:08 UTC 2020 - Dr. Werner Fink <werner@suse.de>
 

texlive.spec

@@ -19,7 +19,7 @@
 %define texlive_version  2020
 %define texlive_previous 2019
 %define texlive_release  20200327
-%define texlive_noarch   172
+%define texlive_noarch   174
 %define texlive_source   texlive-20200327-source
 
 %define __perl_requires		%{nil}
@@ -259,6 +259,7 @@ Patch17:        source-64.dif
 Patch18:        source-a2ping.dif
 Patch19:        source-dvipng.dif
 Patch20:        source-missed-scripts.dif
+Patch21:        source-ppc64.dif
 # PATCH-FIX-SUSE Make biber work with our perl
 Patch42:        biblatex-encoding.dif
 # PATCH-FIX-SUSE Old problem back: we do not use internal Certs!
@@ -1133,6 +1134,7 @@ Group:          Productivity/Publishing/TeX/Utilities
 URL:            http://www.tug.org/texlive/
 Obsoletes:      texlive-dvipdfm-bin <= 2012
 Provides:       texlive-dvipdfm-bin = %{texlive_version}
+Requires:       texlive-scripts >= %{texlive_version}
 Requires:       texlive-xetex-bin >= %{texlive_version}
 Requires(pre):  texlive-dvipdfmx >= %{texlive_version}
 #!BuildIgnore:  texlive-dvipdfmx
@@ -3806,6 +3808,7 @@ This package is required by the package texlive-biber-bin.
 %patch18 -p0 -b .a2p
 %patch19 -p0 -b .dvipng
 %patch20 -p0 -b .missed
+%patch21 -p0 -b .ppcelf
 pushd libs/luajit/LuaJIT-src/
 %patch104 -p1 -b .ppc64
 %patch106 -p1 -b .arm64
@@ -4310,23 +4313,23 @@ fi
 	    while IFS=$'\a' read dst src; do
 		case "$src" in
 %if 0%{texlive_version} >= 2013
-		*/texmf/*)	ln -sf ../share/texmf/${src#../texmf/}	    $dst ;;
+		*/texmf/*)	ln -vsf ../share/texmf/${src#../texmf/}	    $dst ;;
 %else
-		*/texmf/*)	ln -sf ../lib/texmf/${src#../texmf/}	    $dst ;;
+		*/texmf/*)	ln -vsf ../lib/texmf/${src#../texmf/}	    $dst ;;
 %endif
-		*/texmf-dist/*)	ln -sf ../share/texmf/${src#../texmf-dist/} $dst ;;
+		*/texmf-dist/*)	ln -vsf ../share/texmf/${src#../texmf-dist/} $dst ;;
 		esac
 	    done
 	# set xasy script link
 %if 0%{texlive_version} >= 2013
-	ln -sf ../share/texmf/asymptote/GUI/xasy.py xasy
+	ln -vsf ../share/texmf/asymptote/GUI/xasy.py xasy
 %else
-	ln -sf ../lib/texmf/asymptote/GUI/xasy.py xasy
+	ln -vsf ../lib/texmf/asymptote/GUI/xasy.py xasy
 %endif
 	# some scripts not included in main source tar ball
-	test -e match_parens || ln -sf ../share/texmf/scripts/match_parens/match_parens match_parens
+	test -e match_parens || ln -vsf ../share/texmf/scripts/match_parens/match_parens match_parens
-	test -e mf2pt1       || ln -sf ../share/texmf/scripts/mf2pt1/mf2pt1.pl mf2pt1
+	test -e mf2pt1       || ln -vsf ../share/texmf/scripts/mf2pt1/mf2pt1.pl mf2pt1
-	test -e urlbst       || ln -sf ../share/texmf/scripts/urlbst/urlbst urlbst
+	test -e urlbst       || ln -vsf ../share/texmf/scripts/urlbst/urlbst urlbst
 	# set some may missed symbolic links
 	test -e mfplain  || ln -vsf mpost    mfplain
 	test -e texlua   || ln -vsf luatex   texlua
@@ -4356,15 +4359,18 @@ fi
 	fi
 %if 0%{texlive_version} >= 2017
 	# new dviinfox perl script
-	ln -sf ../share/texmf/scripts/dviinfox/dviinfox.pl dviinfox
+	ln -vsf ../share/texmf/scripts/dviinfox/dviinfox.pl dviinfox
 %endif
 %if 0%{texlive_version} >= 2018
 	# new ketcindy wrapper script
-	ln -sf ../share/texmf/scripts/ketcindy/ketcindy.sh ketcindy
+	ln -vsf ../share/texmf/scripts/ketcindy/ketcindy.sh ketcindy
 %endif
 %if 0%{texlive_version} >= 2020
 	# new git-latexdiff wrapper script
-	ln -sf ../share/texmf/scripts/git-latexdiff/git-latexdiff git-latexdiff
+	ln -vsf ../share/texmf/scripts/git-latexdiff/git-latexdiff git-latexdiff
+	# ... and add rungs texlua script as dvipdfmx/dvipdfm require this
+	ln -vsf ../share/texmf/scripts/texlive/rungs.tlu rungs
+	rm -vf %{buildroot}%{_texmfdistdir}/scripts/texlive/rungs.tlu
 %endif
     popd
 
@@ -4378,13 +4384,6 @@ fi
 	install -m 0755 scripts/pmx/pmx2pdf.lua %{buildroot}%{_texmfdistdir}/scripts/pmx/
     popd
 %endif
-    # ... and add rungs texlua script as dvipdfmx/dvipdfm require this
-    pushd ${prefix}/texmf-dist/
-	sed -rn '\@^#![[:space:]]*/usr/bin/env[[:space:]]+texlua@{s@(/usr/bin/)env[[:space:]]+(texlua)@\1\2@p}' \
-		        scripts/texlive/rungs.tlu
-	install -m 0755 scripts/texlive/rungs.tlu %{buildroot}%{_texmfdistdir}/scripts/texlive/
-    popd
-
     # install manual page of public
     install -m 0644 %{S:51} %{buildroot}%{_mandir}/man8/public.8
 
@@ -4792,7 +4791,6 @@ VERBOSE=false %{_texmfdistdir}/texconfig/update || :
 %{_bindir}/dvipdfm
 %{_bindir}/dvipdfmx
 %{_bindir}/rungs
-%{_texmfdistdir}/scripts/texlive/rungs.tlu
 %{_bindir}/dvipdft
 %{_bindir}/ebb
 %{_bindir}/extractbb