[ghc-regex-compat] add hscolour, update url, drop -o obsoletes

[Jens Petersen]

commit 04d28382a3df1537ed09cda4b4ac7c8571f9d83b
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Nov 25 19:24:35 2010 +1000

    add hscolour, update url, drop -o obsoletes

 ghc-regex-compat.spec |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/ghc-regex-compat.spec b/ghc-regex-compat.spec
index a0e1781..bd98f11 100644
--- a/ghc-regex-compat.spec
+++ b/ghc-regex-compat.spec
@@ -8,6 +8,7 @@
 %global ghc_pkg_deps ghc-regex-posix-devel
 
 %bcond_without shared
+%bcond_without hscolour
 
 # debuginfo is not useful for ghc
 %global debug_package %{nil}
@@ -15,18 +16,21 @@
 Name:           ghc-%{pkg_name}
 # part of haskell-platform-2010.2.0.0
 Version:        0.93.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        BSD
-URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
+URL:            http://hackage.haskell.org/package/%{pkg_name}
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
 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.8.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
@@ -53,10 +57,14 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
-%ghc_lib_package -o 0.93.1-1
+%ghc_lib_package
 
 
 %changelog
+* Thu Nov 25 2010 Jens Petersen <petersen at redhat.com> - 0.93.1-2
+- update url and drop -o obsoletes
+- add hscolour
+
 * Fri Jul 16 2010 Jens Petersen <petersen at redhat.com> - 0.93.1-1
 - update to 0.93.1 for haskell-platform-2010.2.0.0
 - obsolete doc subpackage (ghc-rpm-macros-0.8.0)