From 400c1175509d86b432972eaec09e76f82198820b Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Mon, 20 Dec 2021 13:45:07 +0800
Subject: [PATCH] _arch fits Cabal better for ghclibplatform

---
 ghc-rpm-macros.spec | 5 ++++-
 macros.ghc          | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 201de12..04b1109 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -7,7 +7,7 @@
 %endif
 
 Name:           ghc-rpm-macros
-Version:        2.3.7
+Version:        2.3.8
 Release:        1%{?dist}
 Summary:        RPM macros for building Haskell packages for GHC
 
@@ -184,6 +184,9 @@ EOF
 
 
 %changelog
+* Mon Dec 20 2021 Jens Petersen <petersen@redhat.com> - 2.3.8-1
+- _arch fits Cabal better for ghclibplatform
+
 * Mon Dec 20 2021 Jens Petersen <petersen@redhat.com> - 2.3.7-1
 - ghclibplatform: Cabal uses i386 for i686
 
diff --git a/macros.ghc b/macros.ghc
index c185808..dc91a70 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -67,7 +67,7 @@ fi\
 %ghcliblib %{ghclibdir}%{?with_hadrian:/lib}
 
 # Cabal has specific arch names
-%ghclibplatform %{ghcliblib}%{?with_hadrian:/%(arch | sed -e "s/ppc64le/ppc64/" -e "s/i686/i386/")-linux-ghc-%{ghc_version}}
+%ghclibplatform %{ghcliblib}%{?with_hadrian:/%(echo %{_arch} | sed -e "s/ppc64le/ppc64/")-linux-ghc-%{ghc_version}}
 
 # ghc_gen_filelists [name] [version]
 %ghc_gen_filelists()\