From 7914f5f0d06e2ae25baa60e22d76148f256a02c9 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Sat, 3 Dec 2011 00:08:13 +0900
Subject: [PATCH] update to 0.10, cabal2spec-0.24.1, re-enable haddock

---
 .gitignore                |  1 +
 sources                   |  2 +-
 xmonad-dynamic-link.patch | 10 +++++-----
 xmonad.spec               | 15 ++++++++-------
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index ef32c15..68c2510 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 xmonad-0.9.1.tar.gz
 /xmonad-0.9.2.tar.gz
+/xmonad-0.10.tar.gz
diff --git a/sources b/sources
index a3c864d..4b3d05c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5a4117f798664d772d2a834ea6c90f1c  xmonad-0.9.2.tar.gz
+f8381e1ec15137863558a454d4466467  xmonad-0.10.tar.gz
diff --git a/xmonad-dynamic-link.patch b/xmonad-dynamic-link.patch
index 92c7629..227898f 100644
--- a/xmonad-dynamic-link.patch
+++ b/xmonad-dynamic-link.patch
@@ -1,10 +1,10 @@
-diff -u xmonad-0.9.1/XMonad/Core.hs\~ xmonad-0.9.1/XMonad/Core.hs
---- xmonad-0.9.1/XMonad/Core.hs~	2009-12-17 09:25:04.000000000 +1000
-+++ xmonad-0.9.1/XMonad/Core.hs	2010-09-12 16:39:48.553458230 +1000
-@@ -420,7 +420,7 @@
+diff -u xmonad-0.10/XMonad/Core.hs\~ xmonad-0.10/XMonad/Core.hs
+--- xmonad-0.10/XMonad/Core.hs~	2011-11-19 08:14:36.000000000 +0900
++++ xmonad-0.10/XMonad/Core.hs	2011-12-02 22:54:45.903562496 +0900
+@@ -456,7 +456,7 @@
          -- temporarily disable SIGCHLD ignoring:
          uninstallSignalHandlers
-         status <- bracket (openFile err WriteMode) hClose $ \h -> do
+         status <- bracket (openFile err WriteMode) hClose $ \h ->
 -            waitForProcess =<< runProcess "ghc" ["--make", "xmonad.hs", "-i", "-ilib", "-fforce-recomp", "-v0", "-o",binn] (Just dir)
 +            waitForProcess =<< runProcess "ghc" ["-dynamic", "-no-user-package-conf", "--make", "xmonad.hs", "-i", "-ilib", "-fforce-recomp", "-v0", "-o",binn] (Just dir)
                                      Nothing Nothing Nothing (Just h)
diff --git a/xmonad.spec b/xmonad.spec
index cd22dcc..600affd 100644
--- a/xmonad.spec
+++ b/xmonad.spec
@@ -1,7 +1,5 @@
 %global pkg_name xmonad
 
-%global without_haddock 1
-
 %global common_summary xmonad tiling window manager
 
 %global common_description xmonad is a tiling window manager for X. Windows are arranged\
@@ -15,8 +13,8 @@ workspace. Xinerama is fully supported, allowing windows to be tiled\
 on several screens.
 
 Name:           %{pkg_name}
-Version:        0.9.2
-Release:        11%{?dist}.2
+Version:        0.10
+Release:        1%{?dist}
 Summary:        A tiling window manager
 
 Group:          User Interface/X
@@ -33,7 +31,9 @@ Patch1:         xmonad-dynamic-link.patch
 ExclusiveArch:  %{ghc_arches}
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
+%if %{undefined without_hscolour}
 BuildRequires:  hscolour
+%endif
 BuildRequires:  desktop-file-utils
 BuildRequires:  ghc-mtl-prof, ghc-X11-prof, ghc-extensible-exceptions-prof
 Requires:       %{pkg_name}-core = %{version}-%{release}
@@ -96,11 +96,9 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/man/xmonad.hs
 
 
 %files
-%defattr(-,root,root,-)
 
 
 %files core
-%defattr(-,root,root,-)
 %doc CONFIG LICENSE README man/%{name}.hs README.fedora
 %attr(755,root,root) %{_bindir}/%{name}
 %attr(755,root,root) %{_bindir}/%{name}-start
@@ -110,7 +108,6 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/man/xmonad.hs
 
 
 %files gnome
-%defattr(-,root,root,-)
 %{_datadir}/xsessions/%{name}-gnome.desktop
 %{_datadir}/gnome-session/sessions/%{name}.session
 
@@ -119,6 +116,10 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/man/xmonad.hs
 
 
 %changelog
+* Fri Dec  2 2011 Jens Petersen <petersen@redhat.com> - 0.10-1
+- update to 0.10 and cabal2spec-0.24.1
+- re-enable haddock
+
 * Wed Oct 26 2011 Marcela Mašláňová <mmaslano@redhat.com> - 0.9.2-11.2
 - rebuild with new gmp without compat lib