From 7b33bf286c17166c68c675da66ce0dfe0c414de4 Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@redhat.com>
Date: May 17 2019 23:07:23 +0000
Subject: Export DOTNET_ROOT in profile to make apphost lookup work


Also add support for non-x86_64 architecures by using %{_libdir} for
path.

---

diff --git a/dotnet.sh b/dotnet.sh
deleted file mode 100644
index 1d1fca1..0000000
--- a/dotnet.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-
-# Set location of shared framework
-[ -z "$DOTNET_ROOT" ] && DOTNET_ROOT=/usr/lib64/dotnet
-
-# Add dotnet tools directory to PATH
-DOTNET_TOOLS_PATH="$HOME/.dotnet/tools"
-case "$PATH" in
-    *"$DOTNET_TOOLS_PATH"* ) true ;;
-    * ) PATH="$PATH:$DOTNET_TOOLS_PATH" ;;
-esac
diff --git a/dotnet.sh.in b/dotnet.sh.in
new file mode 100644
index 0000000..853ccbd
--- /dev/null
+++ b/dotnet.sh.in
@@ -0,0 +1,10 @@
+
+# Set location for AppHost lookup
+[ -z "$DOTNET_ROOT" ] && export DOTNET_ROOT=@LIBDIR@/dotnet
+
+# Add dotnet tools directory to PATH
+DOTNET_TOOLS_PATH="$HOME/.dotnet/tools"
+case "$PATH" in
+    *"$DOTNET_TOOLS_PATH"* ) true ;;
+    * ) PATH="$PATH:$DOTNET_TOOLS_PATH" ;;
+esac
diff --git a/dotnet2.2.spec b/dotnet2.2.spec
index 05ba90a..4000798 100644
--- a/dotnet2.2.spec
+++ b/dotnet2.2.spec
@@ -33,7 +33,7 @@
 
 Name:           %{simple_name}2.2
 Version:        %{sdk_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        .NET Core CLI tools and runtime
 License:        MIT and ASL 2.0 and BSD
 URL:            https://github.com/dotnet/
@@ -42,7 +42,7 @@ URL:            https://github.com/dotnet/
 # ./build-dotnet-tarball dotnet-v%%{runtime_version}
 Source0:        dotnet-v%{runtime_version}.tar.gz
 Source1:        check-debug-symbols.py
-Source2:        dotnet.sh
+Source2:        dotnet.sh.in
 
 Patch100:       corefx-32956-alpn.patch
 Patch101:       corefx-optflags-support.patch
@@ -242,6 +242,7 @@ VERBOSE=1 ./build.sh \
   /p:MinimalConsoleLogOutput=false \
   /p:ContinueOnPrebuiltBaselineError=true \
 
+sed -e 's|[@]LIBDIR[@]|%{_libdir}|g' %{SOURCE2} > dotnet.sh
 
 %install
 install -d -m 0755 %{buildroot}%{_libdir}/%{simple_name}/
@@ -254,9 +255,8 @@ find %{buildroot}%{_libdir}/%{simple_name}/ -type f -name '*.targets' -exec chmo
 find %{buildroot}%{_libdir}/%{simple_name}/ -type f -name '*.dll' -exec chmod -x {} \;
 find %{buildroot}%{_libdir}/%{simple_name}/ -type f -name '*.pubxml' -exec chmod -x {} \;
 
-# Add ~/.dotnet/tools to $PATH for all users
 install -dm 0755 %{buildroot}%{_sysconfdir}/profile.d/
-install %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/
+install dotnet.sh %{buildroot}%{_sysconfdir}/profile.d/
 
 install -dm 755 %{buildroot}/%{_datadir}/bash-completion/completions
 # dynamic completion needs the file to be named the same as the base command
@@ -312,6 +312,9 @@ echo "Testing build results for debug symbols..."
 %{_libdir}/%{simple_name}/sdk/%{sdk_version}
 
 %changelog
+* Fri May 17 2019 Omair Majid <omajid@redhat.com> - 2.2.107-2
+- Set DOTNET_ROOT in profile to make apphost lookup work
+
 * Wed May 15 2019 Omair Majid <omajid@redhat.com> - 2.2.107-1
 - Update to .NET Core Runtime 2.2.5 and SDK 2.2.107