From befa5e103ea5dd4c546c78d410e2cbe62e5383d2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 24 Aug 2012 22:23:20 +0900 Subject: [PATCH] make haddock build hoogle files, no longer need to disable building ghci lib files --- ghc-rpm-macros.ghc | 4 ++-- ghc-rpm-macros.spec | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc index 379b132..74a0966 100644 --- a/ghc-rpm-macros.ghc +++ b/ghc-rpm-macros.ghc @@ -250,7 +250,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} %{?1:--docdir=%{_docdir}/ghc-%1-%2 --htmldir=%{ghclibdocdir}/%1-%2} %{!?ghc_with_lib_for_ghci:--disable-library-for-ghci}\ +%cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?1:--docdir=%{_docdir}/ghc-%1-%2 --htmldir=%{ghclibdocdir}/%1-%2} \ %cabal build\ %{nil} @@ -258,7 +258,7 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \ %ghc_lib_build()\ %ghc_lib_build_without_haddock\ %if %{undefined without_haddock}\ -%cabal haddock %{!?without_hscolour:%(if [ -x %{_bindir}/HsColour ]; then echo --hyperlink-source; fi)}\ +%cabal haddock %{!?without_hscolour:%(if [ -x %{_bindir}/HsColour ]; then echo --hyperlink-source; fi)} --hoogle\ %endif\ %{nil} diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index c2a4117..3662f58 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -3,8 +3,8 @@ %global macros_file %{_sysconfdir}/rpm/macros.ghc Name: ghc-rpm-macros -Version: 0.95.6 -Release: 2%{?dist} +Version: 0.96 +Release: 1%{?dist} Summary: Macros for building packages for GHC Group: Development/Libraries @@ -64,6 +64,10 @@ EOF %changelog +* Fri Aug 24 2012 Jens Petersen - 0.96-1 +- make haddock build hoogle files +- Fedora ghc-7.4.2 Cabal will not build ghci lib files by default + * Thu Jul 19 2012 Fedora Release Engineering - 0.95.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild