From 4916ea7fbe8d0a758ae1c7afaaaa837a3cb7f135 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Thu, 25 Nov 2010 17:59:45 +1000
Subject: [PATCH] obsolete ghc-gtk2hs-doc and fix build with Cabal-1.10

---
 ghc-glib-Gtk2HsSetup-Cabal-1.10.patch | 12 ++++++++++++
 ghc-glib.spec                         |  7 +++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 ghc-glib-Gtk2HsSetup-Cabal-1.10.patch

diff --git a/ghc-glib-Gtk2HsSetup-Cabal-1.10.patch b/ghc-glib-Gtk2HsSetup-Cabal-1.10.patch
new file mode 100644
index 0000000..6ac51db
--- /dev/null
+++ b/ghc-glib-Gtk2HsSetup-Cabal-1.10.patch
@@ -0,0 +1,12 @@
+diff -u cairo-0.11.1/Gtk2HsSetup.hs\~ cairo-0.11.1/Gtk2HsSetup.hs
+--- cairo-0.11.1/Gtk2HsSetup.hs~	2010-11-25 17:16:11.000000000 +1000
++++ cairo-0.11.1/Gtk2HsSetup.hs	2010-11-25 17:32:40.000000000 +1000
+@@ -187,7 +187,7 @@
+      _ | modeGenerateRegFile   -> die "Generate Reg File not supported"
+        | modeGenerateRegScript -> die "Generate Reg Script not supported"
+        | otherwise             -> registerPackage verbosity
+-                                    installedPkgInfo pkg lbi inplace packageDb
++                                    installedPkgInfo pkg lbi inplace [packageDb]
+ 
+   where
+     modeGenerateRegFile = isJust (flagToMaybe (regGenPkgConf regFlags))
diff --git a/ghc-glib.spec b/ghc-glib.spec
index 14ec523..6c00275 100644
--- a/ghc-glib.spec
+++ b/ghc-glib.spec
@@ -11,7 +11,7 @@
 
 Name:           ghc-%{pkg_name}
 Version:        0.11.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -27,6 +27,7 @@ BuildRequires:  ghc-rpm-macros >= 0.8.2
 BuildRequires:  hscolour
 %{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
 BuildRequires:  gtk2hs-buildtools
+Patch1:         ghc-glib-Gtk2HsSetup-Cabal-1.10.patch
 
 %description
 %{common_description}
@@ -39,6 +40,7 @@ This package provides the shared library.
 
 %prep
 %setup -q -n %{pkg_name}-%{version}
+%patch1 -p1 -b .orig
 
 
 %build
@@ -55,8 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Nov 23 2010 Jens Petersen <petersen@redhat.com>
+* Thu Nov 25 2010 Jens Petersen <petersen@redhat.com> - 0.11.2-4
 - obsolete ghc-gtk2hs-doc
+- fix build with Cabal-1.10 with ghc-glib-Gtk2HsSetup-Cabal-1.10.patch
 
 * Sat Sep 25 2010 Jens Petersen <petersen@redhat.com> - 0.11.2-3
 - obsolete ghc-gtk2hs gconf, gstreamer, and svgcairo