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

[Jens Petersen]

commit ae2f1e40899164ae232d03886bcd9bcd537127e8
Author: Jens Petersen <petersen at redhat.com>
Date:   Sat Sep 4 20:55:45 2010 +1000

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

 ghc-xhtml.spec |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/ghc-xhtml.spec b/ghc-xhtml.spec
index dbe7e52..040cb0e 100644
--- a/ghc-xhtml.spec
+++ b/ghc-xhtml.spec
@@ -6,14 +6,15 @@
 Frameset variants.
 
 %bcond_without shared
+%bcond_without hscolour
 
 # debuginfo is not useful for ghc
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-# part of haskell-platform-2010.1.0.0
+# part of haskell-platform-2010.2.0.0
 Version:        3000.2.0.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -24,7 +25,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}
@@ -33,33 +37,30 @@ This package provides the shared library.
 %endif
 
 
-%{?ghc_lib_package}
-
-
 %prep
 %setup -q -n %{pkg_name}-%{version}
 
 
 %build
-%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
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%ghc_lib_package -o 3000.2.0.1-5
+
+
 %changelog
+* Sat Sep  4 2010 Jens Petersen <petersen at redhat.com> - 3000.2.0.1-5
+- 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> - 3000.2.0.1-4
 - strip shared library (cabal2spec-0.21.4)