From ad76ca4d4c74f241053f526c157ab7ea08cbf9f5 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Mon, 20 Dec 2021 03:05:20 +0800
Subject: [PATCH] ghclibplatform: Cabal calls i686 as i386

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

diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 9665280..201de12 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -7,7 +7,7 @@
 %endif
 
 Name:           ghc-rpm-macros
-Version:        2.3.6
+Version:        2.3.7
 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.7-1
+- ghclibplatform: Cabal uses i386 for i686
+
 * Mon Dec 20 2021 Jens Petersen <petersen@redhat.com> - 2.3.6-1
 - fix missing Hadrian ghc dependency generation
 
diff --git a/macros.ghc b/macros.ghc
index 84ff039..c185808 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -66,7 +66,8 @@ fi\
 
 %ghcliblib %{ghclibdir}%{?with_hadrian:/lib}
 
-%ghclibplatform %{ghcliblib}%{?with_hadrian:/%(arch | sed -e "s/ppc64le/ppc64/")-linux-ghc-%{ghc_version}}
+# Cabal has specific arch names
+%ghclibplatform %{ghcliblib}%{?with_hadrian:/%(arch | sed -e "s/ppc64le/ppc64/" -e "s/i686/i386/")-linux-ghc-%{ghc_version}}
 
 # ghc_gen_filelists [name] [version]
 %ghc_gen_filelists()\