From 5abcaaca3341b3497b6e00bfc9ed95a6f307896f Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Tue, 5 Jun 2012 11:40:54 +0900
Subject: [PATCH] add ghc_lib_build_without_haddock; no longer drop into
 subpackage dirs

---
 ghc-rpm-macros.ghc  | 13 +++++++------
 ghc-rpm-macros.spec |  7 +++++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index fddf790..7ade6fb 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -252,16 +252,19 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \
 %cabal_configure\
 %cabal build
 
-# ghc_lib_build [name] [version]
-%ghc_lib_build()\
+# ghc_lib_build_without_haddock [name] [version]
+%ghc_lib_build_without_haddock()\
 %global debug_package %{nil}\
-%{?1:cd %1-%2}\
 %cabal_configure %{!?without_prof:-p} %{?1:--docdir=%{_docdir}/ghc-%1-%2 --htmldir=%{ghclibdocdir}/%1-%2}\
 %cabal build\
+%{nil}
+
+# ghc_lib_build [name] [version]
+%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)}\
 %endif\
-%{?1:cd ..}\
 %{nil}
 
 # install bin package
@@ -276,10 +279,8 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \
 %global _use_internal_dependency_generator 0\
 %global __find_provides %{_rpmconfigdir}/ghc-deps.sh --provides %{buildroot}%{ghclibdir}\
 %global __find_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir}\
-%{?1:cd %1-%2}\
 %cabal_install\
 %cabal_pkg_conf\
-%{?1:cd ..}\
 %ghc_gen_filelists\
 %{!?1:%ghc_strip_dynlinked}\
 %{nil}
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 68ec44a..080923f 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -60,11 +60,14 @@ EOF
 
 
 %changelog
-* Fri May 25 2012 Jens Petersen <petersen@redhat.com> - 0.91-1
-- only  build ghci .o library files on ghc_arches_with_ghci
+* Tue Jun  5 2012 Jens Petersen <petersen@redhat.com> - 0.91-1
+- only build ghci .o library files on ghc_arches_with_ghci
 - support meta packages like haskell-platform without base lib files
 - make it possible not to have to use common_summary and common_description
 - rename ghc_binlib_package to ghc_lib_subpackage
+- add ghc_lib_build_without_haddock
+- no longer drop into package dirs when subpackaging with ghc_lib_build and
+  ghc_lib_install
 
 * Mon Mar 19 2012 Jens Petersen <petersen@redhat.com> - 0.90-1
 - use new rpm metadata hash format for ghc-7.4