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

[Jens Petersen]

commit f69075d123e3b4321ab6f03ffe8558bdf9d55cdc
Author: Jens Petersen <petersen at redhat.com>
Date:   Sat Sep 4 22:40:50 2010 +1000

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

 .gitignore        |    1 -
 ghc-parallel.spec |   19 +++++++++++++------
 sources           |    1 -
 3 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4f1ad0d..9a4b7d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-parallel-1.1.0.1.tar.gz
 parallel-2.2.0.1.tar.gz
diff --git a/ghc-parallel.spec b/ghc-parallel.spec
index 0d017da..ea5f140 100644
--- a/ghc-parallel.spec
+++ b/ghc-parallel.spec
@@ -7,14 +7,15 @@
 %global ghc_pkg_deps ghc-deepseq-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.0.1
-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.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
@@ -35,9 +39,6 @@ This package provides the shared library.
 %endif
 
 
-%{?ghc_lib_package}
-
-
 %prep
 %setup -q -n %{pkg_name}-%{version}
 
@@ -55,7 +56,13 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
+%ghc_lib_package -o 2.2.0.1-4
+
+
 %changelog
+* Sat Sep  4 2010 Jens Petersen <petersen at redhat.com> - 2.2.0.1-4
+- add hscolour and doc obsolete (cabal2spec-0.22.2)
+
 * Sun Jun 27 2010 Jens Petersen <petersen at redhat.com> - 2.2.0.1-3
 - sync cabal2spec-0.22.1
 
diff --git a/sources b/sources
index 3bbd21e..8cbeede 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-70fda9f7721f9a3dc8aaf2e24d1846e0  parallel-1.1.0.1.tar.gz
 82151f619cb21518c1bdf4cdfa2e635e  parallel-2.2.0.1.tar.gz