diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 9688f8e..08e729f 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -10,7 +10,7 @@ #%%global without_hscolour 1 Name: ghc-rpm-macros -Version: 1.6.0 +Version: 1.6.1 Release: 1%{?dist} Summary: RPM macros for building packages for GHC @@ -124,6 +124,9 @@ EOF %changelog +* Mon Jun 6 2016 Jens Petersen - 1.6.1-1 +- disable debuginfo again until working + * Fri Jun 3 2016 Jens Petersen - 1.6.0-1 - enable debuginfo package - ghc-7.10 support from copr http://github.com/fedora-haskell/ghc-rpm-macros: diff --git a/macros.ghc b/macros.ghc index 97930c9..8f71099 100644 --- a/macros.ghc +++ b/macros.ghc @@ -102,11 +102,13 @@ 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} %{?ghc_without_shared:--disable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} %{?1:--docdir=%{_docdir}/ghc-%1%{!?fedora:-%2} --htmldir=%{ghclibdocdir}/%1-%2} %{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\ %cabal build\ %{nil}