From f75a976e04277e50b0376dad48d472f452a335cd Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Sun, 19 Dec 2021 10:47:11 +0800
Subject: [PATCH] move Cabal_arch into ghclibplatform macro

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

diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index f1adbaf..b94d01d 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -7,7 +7,7 @@
 %endif
 
 Name:           ghc-rpm-macros
-Version:        2.3.3
+Version:        2.3.4
 Release:        1%{?dist}
 Summary:        RPM macros for building Haskell packages for GHC
 
@@ -184,6 +184,9 @@ EOF
 
 
 %changelog
+* Sun Dec 19 2021 Jens Petersen <petersen@redhat.com> - 2.3.4-1
+- move Cabal_arch into ghclibplatform macro
+
 * Sun Dec 19 2021 Jens Petersen <petersen@redhat.com> - 2.3.3-1
 - fixup ghc_arch renaming it to Cabal_arch
 
diff --git a/macros.ghc b/macros.ghc
index 9e13dfb..03ab170 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -64,12 +64,9 @@ fi\
 
 %_ghclicensedir %{?_defaultlicensedir}%{!?_defaultlicensedir:%_docdir}
 
-# needed for Cabal ppc64le
-%Cabal_arch %(arch | sed -e "s/ppc64le/ppc64/")
-
 %ghcliblib %{ghclibdir}%{?with_hadrian:/lib}
 
-%ghclibplatform %{ghcliblib}%{?with_hadrian:/%{Cabal_arch}-linux-ghc-%{ghc_version}}
+%ghclibplatform %{ghcliblib}%{?with_hadrian:/%(arch | sed -e "s/ppc64le/ppc64/")-linux-ghc-%{ghc_version}}
 
 # ghc_gen_filelists [name] [version]
 %ghc_gen_filelists()\