From 9f61caedc2b7309a951c38b7c17e6f6f17e0e1c04241b931d69809969bf60d69 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Mon, 8 Feb 2016 10:37:31 +0000
Subject: [PATCH] .

OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=203
---
 source.dif      | 31 +++++++++++++++++++++++++++++++
 texlive.changes |  6 ++++++
 2 files changed, 37 insertions(+)

diff --git a/source.dif b/source.dif
index f5f9c55..377637e 100644
--- a/source.dif
+++ b/source.dif
@@ -802,6 +802,37 @@
  exec fmtutil --sys ${1+"$@"}
 --- texk/texlive/linked_scripts/texlive/fmtutil.pl
 +++ texk/texlive/linked_scripts/texlive/fmtutil.pl	2016-01-28 14:13:50.388260141 +0000
+@@ -11,16 +11,16 @@
+ # Original shell script (C) 2001 Thomas Esser, public domain
+ #
+ 
+-my $TEXMFROOT;
++my $TEXMFDIST;
+ 
+ BEGIN {
+   $^W = 1;
+-  $TEXMFROOT = `kpsewhich -var-value=TEXMFROOT`;
++  $TEXMFDIST = `kpsewhich -var-value=TEXMFDIST`;
+   if ($?) {
+-    die "$0: kpsewhich -var-value=TEXMFROOT failed, aborting early.\n";
++    die "$0: kpsewhich -var-value=TEXMFDIST failed, aborting early.\n";
+   }
+-  chomp($TEXMFROOT);
+-  unshift(@INC, "$TEXMFROOT/tlpkg", "$TEXMFROOT/texmf-dist/scripts/texlive");
++  chomp($TEXMFDIST);
++  unshift(@INC, "$TEXMFDIST/tlpkg", "$TEXMFDIST/scripts/texlive");
+   require "mktexlsr.pl";
+   TeX::Update->import();
+ }
+@@ -73,7 +73,7 @@ my @deferred_stdout;
+ # this function checks by itself whether it is running on windows or not
+ reset_root_home();
+ 
+-chomp(our $TEXMFDIST = `kpsewhich --var-value=TEXMFDIST`);
++chomp(our $TEXMFROOT = `kpsewhich --var-value=TEXMFROOT`);
+ chomp(our $TEXMFVAR = `kpsewhich -var-value=TEXMFVAR`);
+ chomp(our $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`);
+ chomp(our $TEXMFCONFIG = `kpsewhich -var-value=TEXMFCONFIG`);
 @@ -283,10 +283,17 @@ sub callback_build_formats {
    my $disabled = 0;
    my $nobuild = 0;
diff --git a/texlive.changes b/texlive.changes
index 3244cd4..4a351af 100644
--- a/texlive.changes
+++ b/texlive.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Feb  8 10:36:43 UTC 2016 - werner@suse.de
+
+- Also enforce fmtutil.pl to use FHS as then it will find mktexlsr.pl
+  boo#965151 
+
 -------------------------------------------------------------------
 Thu Feb  4 14:58:39 UTC 2016 - werner@suse.de