[xmonad] use -no-user-package-conf when compiling xmonad.hs; no longer show README; cabal2spec-0.23.2

[Jens Petersen]

commit c88390e4c56406483d482ce6579bb441c233ce2c
Author: Jens Petersen <petersen at redhat.com>
Date:   Wed Jun 22 17:02:51 2011 +0900

    use -no-user-package-conf when compiling xmonad.hs; no longer show README; cabal2spec-0.23.2
    
    - ignore user configured packages when recompiling user xmonad.hs
      to avoid linking errors (#713035)
    - don't display README.fedora initially on startup anymore
    - drop the ghc-xmonad requires from xmonad-core
    - update to cabal2spec-0.23.2

 xmonad-dynamic-link.patch |    2 +-
 xmonad-start              |    4 +---
 xmonad.spec               |   20 ++++++++++++--------
 3 files changed, 14 insertions(+), 12 deletions(-)
---
diff --git a/xmonad-dynamic-link.patch b/xmonad-dynamic-link.patch
index 923f6d5..92c7629 100644
--- a/xmonad-dynamic-link.patch
+++ b/xmonad-dynamic-link.patch
@@ -6,7 +6,7 @@ diff -u xmonad-0.9.1/XMonad/Core.hs\~ xmonad-0.9.1/XMonad/Core.hs
          uninstallSignalHandlers
          status <- bracket (openFile err WriteMode) hClose $ \h -> do
 -            waitForProcess =<< runProcess "ghc" ["--make", "xmonad.hs", "-i", "-ilib", "-fforce-recomp", "-v0", "-o",binn] (Just dir)
-+            waitForProcess =<< runProcess "ghc" ["-dynamic", "--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)
  
          -- re-enable SIGCHLD:
diff --git a/xmonad-start b/xmonad-start
index acd0367..fcc663e 100644
--- a/xmonad-start
+++ b/xmonad-start
@@ -3,9 +3,7 @@
 #  if no user configuration
 if [ ! -d ~/.xmonad ]; then
     # display the manpage
-    xterm -e "man xmonad" &
-    # and the README
-    xterm -e "less /usr/share/doc/xmonad*/README.fedora" &
+    xterm -e man xmonad &
 
     # try to configure for a gnome session
     if [ "$DESKTOP_SESSION" = "xmonad-gnome" ]; then
diff --git a/xmonad.spec b/xmonad.spec
index e1b510a..f8fd307 100644
--- a/xmonad.spec
+++ b/xmonad.spec
@@ -16,7 +16,7 @@ on several screens.
 
 Name:           %{pkg_name}
 Version:        0.9.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A tiling window manager
 
 Group:          User Interface/X
@@ -30,9 +30,8 @@ Source4:        README.fedora
 Source5:        xmonad-gnome-session.desktop
 Source6:        xmonad.session
 Patch1:         xmonad-dynamic-link.patch
-# fedora ghc archs:
-ExclusiveArch:  %{ix86} x86_64 ppc alpha sparcv9 ppc64
-BuildRequires:  ghc-prof
+ExclusiveArch:  %{ghc_arches}
+BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
 BuildRequires:  hscolour
 BuildRequires:  desktop-file-utils
@@ -54,8 +53,6 @@ Summary:        A tiling window manager
 Requires:       xterm
 # for xmessage
 Requires:       xorg-x11-apps
-# prevent doc file conflicts with ghc-xmonad
-Requires:       ghc-%{pkg_name} = %{version}-%{release}
 
 %description core
 This package contains the core xmonad window manager.
@@ -65,7 +62,7 @@ If you want to configure xmonad please also install either xmonad or xmonad-gnom
 
 %package gnome
 Summary:        xmonad GNOME session
-Requires:       xmonad-core = %{version}-%{release}
+Requires:       %{pkg_name}-core = %{version}-%{release}
 Requires:       ghc-xmonad-contrib-devel
 Requires:       gnome-session, gnome-terminal
 
@@ -122,10 +119,17 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/man/xmonad.hs
 
 
 %changelog
+* Thu Jun 16 2011 Jens Petersen <petersen at redhat.com> - 0.9.2-9
+- ignore user configured packages when recompiling user xmonad.hs
+  to avoid linking errors (#713035)
+- don't display README.fedora initially on startup anymore
+- drop the ghc-xmonad requires from xmonad-core
+- update to cabal2spec-0.23.2
+
 * Fri May 13 2011 Jens Petersen <petersen at redhat.com> - 0.9.2-8
 - add a core subpackage and let the base package can pull in ghc-xmonad*-devel
 - add a gnome subpackage for the gnome session
-- more README.fedore improvements
+- more README.fedora improvements
 - xmonad-start: quote the xterm commands and support ~/.xmonad/session
 - fix doc files conflicts by having xmonad-core require ghc-xmonad