From 4c51ba9f2c38b8ecc061a58fc271ecc20e7cf993 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Fri, 17 Jun 2011 16:01:15 +0900
Subject: [PATCH] update to 1.19

- disable self BR by default
- just depends on containers
---
 .gitignore    |  1 +
 hscolour.spec | 41 +++++++++++++++++++++++------------------
 sources       |  2 +-
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 31c6552..5216573 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 hscolour-1.17.tar.gz
+/hscolour-1.19.tar.gz
diff --git a/hscolour.spec b/hscolour.spec
index c54977c..c2012cf 100644
--- a/hscolour.spec
+++ b/hscolour.spec
@@ -2,18 +2,17 @@
 
 %global common_summary Haskell %{pkg_name} library
 
-%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_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.
 
-# debuginfo is not useful for ghc
-%global debug_package %{nil}
-# build without hscolour when ghc is re-based (replace # by %)
-#global without_hscolour 1
+# build without self by default
+%global without_hscolour 1
 
 Name:           %{pkg_name}
-Version:        1.17
-Release:        10%{?dist}
+Version:        1.19
+Release:        1%{?dist}
 Summary:        Colourizes Haskell code
 
 Group:          Development/Tools
@@ -22,22 +21,16 @@ 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
+BuildRequires:  ghc-Cabal-devel
+BuildRequires:  ghc-rpm-macros
 %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,22 @@ 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
+* Fri Jun 17 2011 Jens Petersen <petersen@redhat.com> - 1.19-1
+- update to 1.19
+- disable self BR by default
+- just depends on containers
+
 * Thu May 05 2011 Jiri Skala <jskala@redhat.com> - 1.17-10
 - enable source hscolour again
 
diff --git a/sources b/sources
index 2238b0b..6fb413d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7f8f1673e3ba289d44474d444d75d7ff  hscolour-1.17.tar.gz
+a5203dc75fb759aaee29f73491fb55f8  hscolour-1.19.tar.gz