[ghc-haskeline] update to 0.6.2.3 and cabal2spec-0.22.2

[Jens Petersen]

commit 3e559523beae0301b8e712f8b83f6e13ec6c5fb2
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Aug 19 12:48:23 2010 +1000

    update to 0.6.2.3 and cabal2spec-0.22.2

 .gitignore         |    1 +
 ghc-haskeline.spec |   26 ++++++++++++++------------
 sources            |    2 +-
 3 files changed, 16 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f2b4c89..f9de7b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 haskeline-0.6.2.2.tar.gz
+/haskeline-0.6.2.3.tar.gz
diff --git a/ghc-haskeline.spec b/ghc-haskeline.spec
index 2d14bf4..a91416e 100644
--- a/ghc-haskeline.spec
+++ b/ghc-haskeline.spec
@@ -11,13 +11,14 @@ Haskeline runs both on POSIX-compatible systems and on Windows.
 %global ghc_pkg_deps ghc-mtl-devel ghc-utf8-string-devel
 
 %bcond_without shared
-
+%bcond_without hscolour
+ 
 # debuginfo is not useful for ghc
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-Version:        0.6.2.2
-Release:        2%{?dist}
+Version:        0.6.2.3
+Release:        1%{?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.6.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
@@ -46,18 +50,12 @@ This package provides the shared library.
 
 
 %build
-%cabal_configure --ghc -p
-%cabal build
-%cabal haddock
+%ghc_lib_build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%cabal_install
-%cabal_pkg_conf
-
-%ghc_gen_filelists
-%ghc_strip_dynlinked
+%ghc_lib_install
 
 
 %clean
@@ -65,6 +63,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 19 2010 Jens Petersen <petersen at redhat.com> - 0.6.2.3-1
+- update to 0.6.2.3
+- update to cabal2spec-0.22.2
+
 * Fri Jun 25 2010 Jens Petersen <petersen at redhat.com> - 0.6.2.2-2
 - strip shared library (cabal2spec-0.21.4)
 
diff --git a/sources b/sources
index 3c90381..55463ab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c23a8ffbcff7cb42f0ee6ca6946285bb  haskeline-0.6.2.2.tar.gz
+4e48c5dd0133f20ce69c6a5813fb82d9  haskeline-0.6.2.3.tar.gz