[ghc-xmonad-contrib] ghc-rpm-macros-0.8.1: add hscolour and doc obsolete (cabal2spec-0.22.2)

[Jens Petersen]

commit 26fd54b929a66360e2aa3155d7e9c5eecfb6fccc
Author: Jens Petersen <petersen at redhat.com>
Date:   Sat Sep 4 22:49:07 2010 +1000

    ghc-rpm-macros-0.8.1: add hscolour and doc obsolete (cabal2spec-0.22.2)

 ghc-xmonad-contrib.spec |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/ghc-xmonad-contrib.spec b/ghc-xmonad-contrib.spec
index 46d32dc..201b9ae 100644
--- a/ghc-xmonad-contrib.spec
+++ b/ghc-xmonad-contrib.spec
@@ -16,13 +16,14 @@ your own extensions.
 %global ghc_pkg_deps ghc-X11-xft-devel, ghc-utf8-string-devel, ghc-xmonad-devel
 
 %bcond_without shared
+%bcond_without hscolour
 
 # debuginfo is not useful for ghc
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
 Version:        0.9.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -33,7 +34,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.7.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,9 +47,6 @@ This package provides the shared library.
 %endif
 
 
-%{?ghc_lib_package}
-
-
 %prep
 %setup -q -n %{pkg_name}-%{version}
 
@@ -63,7 +64,13 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
+%ghc_lib_package -o 0.9.1-6
+
+
 %changelog
+* Sat Sep  4 2010 Jens Petersen <petersen at redhat.com> - 0.9.1-6
+- add hscolour and doc obsolete (cabal2spec-0.22.2)
+
 * Sat Jun 26 2010 Jens Petersen <petersen at redhat.com> - 0.9.1-5
 - sync cabal2spec-0.22