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

[Jens Petersen]

commit bdfd48d7450a6230fe188ff20591bc9fceb40bca
Author: Jens Petersen <petersen at redhat.com>
Date:   Sat Sep 4 21:04:50 2010 +1000

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

 ghc-network.spec |   27 ++++++++++++++++-----------
 1 files changed, 16 insertions(+), 11 deletions(-)
---
diff --git a/ghc-network.spec b/ghc-network.spec
index 3dfaf35..38bb35e 100644
--- a/ghc-network.spec
+++ b/ghc-network.spec
@@ -7,14 +7,15 @@
 %global ghc_pkg_deps ghc-parsec-devel
 
 %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:        2.2.1.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -25,7 +26,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_deps:BuildRequires:  %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
 
 %description
@@ -43,25 +47,26 @@ This package provides the shared library.
 
 
 %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 2.2.1.7-4
+
+
 %changelog
+* Sat Sep  4 2010 Jens Petersen <petersen at redhat.com> - 2.2.1.7-4
+- update to latest macros, hscolour and drop doc pkg (cabal2spec-0.22.2)
+- part of haskell-platform-2010.2.0.0
+
 * Fri Jun 25 2010 Jens Petersen <petersen at redhat.com> - 2.2.1.7-3
 - strip shared library (cabal2spec-0.21.4)