diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc index 2e24f6b..87c0998 100644 --- a/ghc-rpm-macros.ghc +++ b/ghc-rpm-macros.ghc @@ -92,7 +92,7 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \ # 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}-%{version}} %{?1:--docdir=%{_docdir}/ghc-%1-%2 --htmldir=%{ghclibdocdir}/%1-%2} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\ +%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} %{?1:--docdir=%{_docdir}/ghc-%1-%2 --htmldir=%{ghclibdocdir}/%1-%2} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci} --ghc-option=-O2\ %cabal build\ %{nil} diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index cfb2aa9..1f7e6e1 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.99.2 +Version: 0.99.3 Release: 1%{?dist} Summary: RPM macros for building packages for GHC @@ -87,6 +87,9 @@ EOF %changelog +* Thu Jun 6 2013 Jens Petersen - 0.99.3-1 +- configure builds with ghc -O2 (#880135) + * Wed Jun 5 2013 Jens Petersen - 0.99.2-1 - drop -h option from extra macros and make -m work again