[ghc-GLUT/f14/master] - ghc-rpm-macros-0.8.1 for doc obsoletes - part of haskell-platform-2010.2.0.0 - add hscolour

[Jens Petersen]

commit e339c48875fd65abb72360f2aaf177b0d25b535b
Author: Jens Petersen <petersen at redhat.com>
Date:   Sat Jul 31 21:07:44 2010 +1000

    - ghc-rpm-macros-0.8.1 for doc obsoletes
    - part of haskell-platform-2010.2.0.0
    - add hscolour

 ghc-GLUT.spec |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)
---
diff --git a/ghc-GLUT.spec b/ghc-GLUT.spec
index 06b39d6..03f0948 100644
--- a/ghc-GLUT.spec
+++ b/ghc-GLUT.spec
@@ -10,14 +10,15 @@ This is a set of bindings to the C %{pkg_name} library.
 %global ghc_pkg_c_deps freeglut-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.1.2.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -28,7 +29,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")}
 %{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
 Patch1:         ghc-GLUT-extralibs.patch
@@ -40,9 +44,6 @@ This package provides the shared library.
 %endif
 
 
-%{?ghc_lib_package}
-
-
 %prep
 %setup -q -n %{pkg_name}-%{version}
 %patch1 -p1 -b .orig
@@ -57,11 +58,19 @@ rm -rf $RPM_BUILD_ROOT
 %ghc_lib_install
 
 
+%ghc_lib_package -o 2.1.2.1-5
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jul 31 2010 Jens Petersen <petersen at redhat.com> - 2.1.2.1-5
+- part of haskell-platform-2010.2.0.0
+- ghc-rpm-macros-0.8.1 for doc obsoletes
+- add hscolour
+
 * Sun Jun 27 2010 Jens Petersen <petersen at redhat.com> - 2.1.2.1-4
 - sync cabal2spec-0.22.1