From 18055a44a4323c622d54932160a1a7c5fc4b7dc6 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Thu, 11 Jul 2013 15:58:30 +0900
Subject: [PATCH] remove ghc_clear_execstack since it doesn't seem to affect
 ghc-7.4.1 or f18

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

diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index 68fe33f..31f8290 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -238,19 +238,12 @@ This package contains the development files.
 find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \\; -exec strip "{}" \\;\
 %endif
 
-# ghc_clear_execstack
-%ghc_clear_execstack\
-if [ -d "%{buildroot}%{_bindir}" ]; then\
-find %{buildroot}%{_bindir} -type f -exec sh -c "file {} | grep -q ' ELF '" \\; -exec execstack -c "{}" \\;\
-fi
-
 # install bin package
 %ghc_bin_install()\
 %global _use_internal_dependency_generator 0\
 %global __find_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir}\
 %cabal_install\
 %{!?1:%ghc_strip_dynlinked}\
-%{!?1:%ghc_clear_execstack}\
 %{nil}
 
 # ghc_lib_install [name] [version]
@@ -262,7 +255,6 @@ fi
 %cabal_pkg_conf\
 %ghc_gen_filelists\
 %{!?1:%ghc_strip_dynlinked}\
-%{!?1:%ghc_clear_execstack}\
 %{nil}
 
 # ghc_fix_dynamic_rpath prog ...
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 9bebfce..e29261f 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -6,7 +6,7 @@
 #%%global without_hscolour 1
 
 Name:           ghc-rpm-macros
-Version:        0.95.12
+Version:        0.95.13
 Release:        1%{?dist}
 Summary:        RPM macros for building packages for GHC
 
@@ -76,6 +76,10 @@ EOF
 
 
 %changelog
+* Thu Jul 11 2013 Jens Petersen <petersen@redhat.com> - 0.95.13-1
+- remove ghc_clear_execstack since the executable stack issue does seem
+  to happen with ghc-7.4.1
+
 * Thu Jul 11 2013 Jens Petersen <petersen@redhat.com> - 0.95.12-1
 - add new ghc_clear_execstack to ghc_bin_install and ghc_lib_install (#973512)
   and require prelink for execstack