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

[Jens Petersen]

commit f3ef81c2d05d7b923633e8ee7fe68eba519575b9
Author: Jens Petersen <petersen at redhat.com>
Date:   Sat Sep 4 17:33:51 2010 +1000

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

 ghc-X11.spec |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/ghc-X11.spec b/ghc-X11.spec
index d5ade74..7bd4d46 100644
--- a/ghc-X11.spec
+++ b/ghc-X11.spec
@@ -9,13 +9,14 @@ Manual", available online at <http://tronche.com/gui/x/xlib/>.
 %global ghc_pkg_c_deps libXinerama-devel, libX11-devel, libXext-devel
 
 %bcond_without shared
+%bcond_without hscolour
 
 # debuginfo is not useful for ghc
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
 Version:        1.5.0.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -26,7 +27,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
 %{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
 
 %description
@@ -36,33 +40,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
+%ghc_lib_install
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%ghc_lib_package -o 1.5.0.0-5
+
+
 %changelog
+* Sat Sep  4 2010 Jens Petersen <petersen at redhat.com> - 1.5.0.0-5
+- update to ghc-rpm-macros-0.8.1, hscolour and drop doc pkg (cabal2spec-0.22.2)
+
 * Wed Jun 23 2010 Jens Petersen <petersen at redhat.com> - 1.5.0.0-4
 - use ghc_strip_dynlinked (ghc-rpm-macros-0.6.0)