From 32b8616ed0e0d59afa5b0f1f8143111ab8d7bba5 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@fedoraproject.org>
Date: Sat, 26 Jun 2010 09:40:41 +0000
Subject: [PATCH] sync cabal2spec-0.22

---
 ghc-xmonad-contrib.spec | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/ghc-xmonad-contrib.spec b/ghc-xmonad-contrib.spec
index 5e37f7e..46d32dc 100644
--- a/ghc-xmonad-contrib.spec
+++ b/ghc-xmonad-contrib.spec
@@ -22,18 +22,18 @@ your own extensions.
 
 Name:           ghc-%{pkg_name}
 Version:        0.9.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc, ghc-rpm-macros >= 0.5.1
-BuildRequires:  ghc-doc
-BuildRequires:  ghc-prof
+BuildRequires:  ghc, ghc-doc, ghc-prof
+BuildRequires:  ghc-rpm-macros >= 0.7.0
 %{?ghc_pkg_deps:BuildRequires:  %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
 
 %description
@@ -51,16 +51,12 @@ This package provides the shared library.
 
 
 %build
-%cabal_configure --ghc -p
-%cabal build
-%cabal haddock
+%ghc_lib_build
 
 
 %install
-%cabal_install
-%cabal_pkg_conf
-
-%ghc_gen_filelists
+rm -rf $RPM_BUILD_ROOT
+%ghc_lib_install
 
 
 %clean
@@ -68,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jun 26 2010 Jens Petersen <petersen@redhat.com> - 0.9.1-5
+- sync cabal2spec-0.22
+
 * Thu Apr 29 2010 Jens Petersen <petersen@redhat.com> - 0.9.1-4
 - rebuild against ghc-6.12.2
 - condition ghc_lib_package