From 3e574ed46053445305a9286a4b9ac8904f6449b8 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Mon, 27 Apr 2020 21:11:59 +0800
Subject: [PATCH] use -package Cabal to build Setup

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

diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index f511f35..6771b9c 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -10,8 +10,8 @@
 #%%global without_hscolour 1
 
 Name:           ghc-rpm-macros
-Version:        2.0.6
-Release:        2%{?dist}
+Version:        2.0.7
+Release:        1%{?dist}
 Summary:        RPM macros for building Haskell packages for GHC
 
 License:        GPLv3+
@@ -211,6 +211,9 @@ EOF
 
 
 %changelog
+* Mon Apr 27 2020 Jens Petersen <petersen@redhat.com> - 2.0.7-1
+- use -package Cabal to build Setup
+
 * Tue Mar  3 2020 Jens Petersen <petersen@redhat.com> - 2.0.6-2
 - obsolete ghc-cabal-helper, ghc-cabal-plan, ghc-derive
 - unobsolete ghc-hgettext
diff --git a/macros.ghc b/macros.ghc
index 831460e..db3050b 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -2,7 +2,7 @@
 # see https://fedoraproject.org/wiki/Packaging:Haskell for more details
 
 # "cabal"
-%cabal [ -x Setup ] || ghc --make -no-user-package-db %{!?ghc_static_setup:-dynamic} Setup\
+%cabal [ -x Setup ] || ghc --make -package Cabal -no-user-package-db %{!?ghc_static_setup:-dynamic} Setup\
 LANG=C.utf8\
 ./Setup