From 5153748ff2aff77d536c556f47253fad7def39ab Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Sun, 12 Nov 2023 13:31:15 +0800
Subject: [PATCH 1/2] make stack-symlink-distro-ghc executable

---
 haskell-platform.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/haskell-platform.spec b/haskell-platform.spec
index de59325..aa29ce0 100644
--- a/haskell-platform.spec
+++ b/haskell-platform.spec
@@ -24,7 +24,7 @@
 
 Name:           haskell-platform
 Version:        2022.1
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        Standard Haskell distribution
 
 License:        BSD
@@ -258,7 +258,7 @@ echo %{_bindir}/haskell-mustache >> %{mustache}/ghc-mustache.files
 mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/
 %{buildroot}%{_bindir}/stack --bash-completion-script stack | sed s/filenames/default/ > %{buildroot}%{_datadir}/bash-completion/completions/stack
 
-install -p -m 644 %{SOURCE20} %{buildroot}%{_bindir}/stack-symlink-distro-ghc
+install -p %{SOURCE20} %{buildroot}%{_bindir}/stack-symlink-distro-ghc
 
 
 %files
@@ -275,6 +275,9 @@ install -p -m 644 %{SOURCE20} %{buildroot}%{_bindir}/stack-symlink-distro-ghc
 
 
 %changelog
+* Sun Nov 12 2023 Jens Petersen <petersen@redhat.com> - 2022.1-21
+- make stack-symlink-distro-ghc executable
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2022.1-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From 3ce671caeb4895c9475fef175a74cae416ddc992 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Sun, 12 Nov 2023 19:32:27 +0800
Subject: [PATCH 2/2] stack-symlink-distro-ghc: also symlink bin/*-ghc-version

---
 haskell-platform.spec    | 5 ++++-
 stack-symlink-distro-ghc | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/haskell-platform.spec b/haskell-platform.spec
index aa29ce0..f9bb2ea 100644
--- a/haskell-platform.spec
+++ b/haskell-platform.spec
@@ -24,7 +24,7 @@
 
 Name:           haskell-platform
 Version:        2022.1
-Release:        21%{?dist}
+Release:        22%{?dist}
 Summary:        Standard Haskell distribution
 
 License:        BSD
@@ -275,6 +275,9 @@ install -p %{SOURCE20} %{buildroot}%{_bindir}/stack-symlink-distro-ghc
 
 
 %changelog
+* Sun Nov 12 2023 Jens Petersen <petersen@redhat.com> - 2022.1-22
+- stack-symlink-distro-ghc: also symlink bin/*-ghc-version
+
 * Sun Nov 12 2023 Jens Petersen <petersen@redhat.com> - 2022.1-21
 - make stack-symlink-distro-ghc executable
 
diff --git a/stack-symlink-distro-ghc b/stack-symlink-distro-ghc
index b5a39ce..d3c7b39 100755
--- a/stack-symlink-distro-ghc
+++ b/stack-symlink-distro-ghc
@@ -29,6 +29,8 @@ mkdir -p $STACK_GHCDIR/bin
 for i in ghc ghc-pkg ghci hp2ps hpc hsc2hs runghc runhaskell; do
     if [ -x /usr/bin/$i-$VERSION ]; then
         ln -s /usr/bin/$i-$VERSION $STACK_GHCDIR/bin/$i
+    elif [ -x /usr/bin/$i-ghc-$VERSION ]; then
+        ln -s /usr/bin/$i-ghc-$VERSION $STACK_GHCDIR/bin/$i
     else
         ln -s /usr/bin/$i $STACK_GHCDIR/bin/$i
     fi