From 5c4bfea95eb795050cd261a4763713aa5228b4a1 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Tue, 24 Jul 2018 17:44:34 +0900
Subject: [PATCH] remove -Wall and -Werror=format-security separately (for
 aarch64 and s390x)

---
 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 6aed998..cde08b4 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -10,8 +10,8 @@
 #%%global without_hscolour 1
 
 Name:           ghc-rpm-macros
-Version:        1.9.0
-Release:        2%{?dist}
+Version:        1.9.1
+Release:        1%{?dist}
 Summary:        RPM macros for building Haskell packages for GHC
 
 License:        GPLv3+
@@ -166,6 +166,9 @@ EOF
 
 
 %changelog
+* Tue Jul 24 2018 Jens Petersen <petersen@redhat.com> - 1.9.1-1
+- remove -Wall and -Werror=format-security separately (on aarch64 and s390x)
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/macros.ghc b/macros.ghc
index d85ef27..e0af09b 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -12,7 +12,7 @@ LANG=en_US.utf8\
 %ghc_set_cflags\
 # -Wunused-label is extremely noisy\
 %ifarch aarch64 s390x\
-CFLAGS="${CFLAGS:-$(echo %optflags | sed -e 's/-Wall -Werror=format-security //')}"\
+CFLAGS="${CFLAGS:-$(echo %optflags | sed -e 's/-Wall //' -e 's/-Werror=format-security //')}"\
 %else\
 CFLAGS="${CFLAGS:-%optflags}"\
 %endif\