From 6fb708eb37bc04a07afb42bac6ca8fd7dc1bfc74 Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@redhat.com>
Date: Oct 11 2019 20:46:27 +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/dotnet3.0.spec b/dotnet3.0.spec
index beea68f..54cefab 100644
--- a/dotnet3.0.spec
+++ b/dotnet3.0.spec
@@ -52,7 +52,7 @@
 
 Name:           dotnet3.0
 Version:        %{sdk_rpm_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/
@@ -61,7 +61,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-optflags-support.patch
 
@@ -338,6 +338,8 @@ VERBOSE=1 ./build.sh \
   /p:ContinueOnPrebuiltBaselineError=true \
 
 
+sed -e 's|[@]LIBDIR[@]|%{_libdir}|g' %{SOURCE2} > dotnet.sh
+
 
 %install
 install -dm 0755 %{buildroot}%{_libdir}/dotnet
@@ -355,9 +357,8 @@ find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.props' -exec chmod -x {} \;
 find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.pubxml' -exec chmod -x {} \;
 find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.targets' -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 0755 %{buildroot}/%{_datadir}/bash-completion/completions
 # dynamic completion needs the file to be named the same as the base command
@@ -430,6 +431,9 @@ echo "Testing build results for debug symbols..."
 %dir %{_libdir}/dotnet/packs
 
 %changelog
+* Fri Oct 11 2019 Omair Majid <omajid@redhat.com> - 3.0.100-2
+- Export DOTNET_ROOT in profile to make apphost lookup work
+
 * Fri Sep 27 2019 Omair Majid <omajid@redhat.com> - 3.0.100-1
 - Update to .NET Core Runtime 3.0.0 and SDK 3.0.100