[ghc-haskell-src-exts] ghc-rpm-macros-0.8.1: add hscolour and doc obsolete (cabal2spec-0.22.2)

[Jens Petersen]

commit 552733cfb5770e822c9dd705f005832d0391eb1b
Author: Jens Petersen <petersen at redhat.com>
Date:   Sat Sep 4 22:12:13 2010 +1000

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

 ghc-haskell-src-exts.spec |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/ghc-haskell-src-exts.spec b/ghc-haskell-src-exts.spec
index 1b769e6..5503f0c 100644
--- a/ghc-haskell-src-exts.spec
+++ b/ghc-haskell-src-exts.spec
@@ -18,13 +18,14 @@ XML syntax.
 %global ghc_pkg_deps ghc-cpphs-devel
 
 %bcond_without shared
+%bcond_without hscolour
 
 # debuginfo is not useful for ghc
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
 Version:        1.9.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -35,7 +36,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")}
 BuildRequires:  happy
 
@@ -46,9 +50,6 @@ This package provides the shared library.
 %endif
 
 
-%{?ghc_lib_package}
-
-
 %prep
 %setup -q -n %{pkg_name}-%{version}
 
@@ -66,7 +67,13 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
+%ghc_lib_package -o 1.9.0-2
+
+
 %changelog
+* Sat Sep  4 2010 Jens Petersen <petersen at redhat.com> - 1.9.0-2
+- add hscolour and doc obsolete (cabal2spec-0.22.2)
+
 * Sat Jun 26 2010 Jens Petersen <petersen at redhat.com> - 1.9.0-1
 - 1.9.0 release
 - sync cabal2spec-0.22