[hscolour/f15] update to cabal2spec-0.23

[Jens Petersen]

commit 1f5a895f89adbb4ad59bf0fdc5b4d7593e5eefda
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Oct 6 18:13:10 2011 +0900

    update to cabal2spec-0.23

 hscolour.spec |   44 ++++++++++++++++++++++++--------------------
 1 files changed, 24 insertions(+), 20 deletions(-)
---
diff --git a/hscolour.spec b/hscolour.spec
index c54977c..f051958 100644
--- a/hscolour.spec
+++ b/hscolour.spec
@@ -1,43 +1,36 @@
 %global pkg_name hscolour
 
-%global common_summary Haskell %{pkg_name} library
+# use following to bootstrap after building a new ghc version:
+#%%{?ghc_bootstrap}
+#%%global without_hscolour 1
 
-%global common_description hscolour is a small Haskell package to colourize Haskell code.\
-It currently has five output formats: ANSI terminal codes,\
-HTML 3.2 with font tags, HTML 4.01 with CSS, LaTeX, and mIRC chat codes.
+%global common_summary Haskell %{pkg_name} library
 
-# debuginfo is not useful for ghc
-%global debug_package %{nil}
-# build without hscolour when ghc is re-based (replace # by %)
-#global without_hscolour 1
+%global common_description hscolour is a small Haskell script to colourize Haskell code.\
+It currently has six output formats: ANSI terminal codes, HTML 3.2\
+with <font> tags, HTML 4.01 with CSS, XHTML 1.0 with inline CSS\
+styling, LaTeX, and mIRC chat client codes.
 
 Name:           %{pkg_name}
 Version:        1.17
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Colourizes Haskell code
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://www.cs.york.ac.uk/fp/darcs/hscolour/
 Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
-# fedora ghc archs:
-ExclusiveArch:  %{ix86} x86_64 ppc alpha sparcv9 ppc64
-BuildRequires:  ghc, ghc-doc, ghc-prof
-BuildRequires:  ghc-rpm-macros >= 0.7.3
+ExclusiveArch:  %{ghc_arches}
+BuildRequires:  ghc-Cabal-devel
+BuildRequires:  ghc-rpm-macros >= 0.13.5
 %if %{undefined without_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:  ghc-containers-prof
 
 %description
 %{common_description}
 
-%files
-%defattr(-,root,root,-)
-%doc LICENCE-GPL
-%attr(755,root,root) %{_bindir}/HsColour
-%{_datadir}/%{name}-%{version}
-
 
 %prep
 %setup -q
@@ -51,10 +44,21 @@ BuildRequires:  hscolour
 %ghc_lib_install
 
 
+%files
+%defattr(-,root,root,-)
+%doc LICENCE-GPL
+%attr(755,root,root) %{_bindir}/HsColour
+%{_datadir}/%{name}-%{version}
+
+
 %ghc_binlib_package
 
 
 %changelog
+* Thu Oct  6 2011 Jens Petersen <petersen at redhat.com> - 1.17-11
+- use ghc_arches (cabal-0.23.2)
+- just depends on containers
+
 * Thu May 05 2011 Jiri Skala <jskala at redhat.com> - 1.17-10
 - enable source hscolour again