[ghc-rpm-macros] no longer disable debuginfo by default

[Jens Petersen]

commit 3efe41dd0c4e6d19be5180d2ab5e2ece35a67ff9
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Aug 29 16:04:33 2014 +0900

    no longer disable debuginfo by default
    
    cblrpm checks if there are C files in a package
    if not it disables debuginfo

 ghc-rpm-macros.spec |    6 +++++-
 macros.ghc          |    2 --
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index efaba1e..6aec82c 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -6,7 +6,7 @@
 #%%global without_hscolour 1
 
 Name:           ghc-rpm-macros
-Version:        1.3.4
+Version:        1.3.5
 Release:        1%{?dist}
 Summary:        RPM macros for building packages for GHC
 
@@ -93,6 +93,10 @@ EOF
 
 
 %changelog
+* Fri Aug 29 2014 Jens Petersen <petersen at redhat.com> - 1.3.5-1
+- no longer disable debuginfo by default:
+  packages now need to explicitly opt out of debuginfo if appropriate
+
 * Thu Aug 28 2014 Jens Petersen <petersen at redhat.com> - 1.3.4-1
 - drop -O2 for ghc-7.8: it uses too much build mem
 
diff --git a/macros.ghc b/macros.ghc
index d45ce18..0b561a4 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -80,13 +80,11 @@ install -D --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf.
 
 # ghc_bin_build
 %ghc_bin_build\
-%global debug_package %{nil}\
 %cabal_configure\
 %cabal build
 
 # ghc_lib_build_without_haddock [name] [version]
 %ghc_lib_build_without_haddock()\
-%global debug_package %{nil}\
 %cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}} %{?1:--docdir=%{_docdir}/ghc-%1%{!?fedora:-%2} --htmldir=%{ghclibdocdir}/%1} %{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\
 %cabal build\
 %{nil}