[cpphs] update to ghc-rpm-macros-0.8.1, hscolour and drop doc pkg (cabal2spec-0.22.2)

[Jens Petersen]

commit 32006d073d393c6689639854abee7c7d4dd7537e
Author: Jens Petersen <petersen at redhat.com>
Date:   Sat Sep 4 20:18:05 2010 +1000

    update to ghc-rpm-macros-0.8.1, hscolour and drop doc pkg (cabal2spec-0.22.2)

 cpphs.spec |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/cpphs.spec b/cpphs.spec
index e8cda4d..3be6662 100644
--- a/cpphs.spec
+++ b/cpphs.spec
@@ -12,13 +12,14 @@ include: a plain-text mode; an option to unlit literate code files; and\
 an option to turn off macro-expansion.
 
 %bcond_without shared
+%bcond_without hscolour
 
 # debuginfo is not useful for ghc
 %global debug_package %{nil}
 
 Name:           %{pkg_name}
 Version:        1.11
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        C pre-processor for Haskell
 Group:          Development/Languages
 License:        GPL+ and LGPLv2+
@@ -28,7 +29,10 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
 BuildRequires:  ghc, ghc-doc, ghc-prof
-BuildRequires:  ghc-rpm-macros >= 0.6.0
+BuildRequires:  ghc-rpm-macros >= 0.8.1
+%if %{with hscolour}
+BuildRequires:  hscolour
+%endif
 
 %description
 %{common_description}
@@ -39,7 +43,7 @@ BuildRequires:  ghc-rpm-macros >= 0.6.0
 %{_bindir}/%{name}
 
 
-%ghc_binlib_package -l LGPLv2+
+%ghc_binlib_package -l LGPLv2+ -o 1.11-4
 
 
 %prep
@@ -47,25 +51,21 @@ BuildRequires:  ghc-rpm-macros >= 0.6.0
 
 
 %build
-# dynamic + prof breaks cabal looking for p_dyn
-%cabal_configure --ghc -p
-%cabal build
-%cabal haddock
+%ghc_lib_build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%cabal_install
-%cabal_pkg_conf
-
-%ghc_gen_filelists
-%ghc_strip_dynlinked
+%ghc_lib_install
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Sat Sep  4 2010 Jens Petersen <petersen at redhat.com> - 1.11-4
+- update to ghc-rpm-macros-0.8.1, hscolour and drop doc pkg (cabal2spec-0.22.2)
+
 * Sat Jun 26 2010 Jens Petersen <petersen at redhat.com> - 1.11-3
 - strip dynlinked files (cabal2spec-0.21.4)