From 6f6481eb493cd2d1350a3767f799593d85de5d1f Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Thu, 22 Mar 2012 22:47:16 +0900
Subject: [PATCH] update to cabal2spec-0.25

---
 ghc-dlist.spec | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/ghc-dlist.spec b/ghc-dlist.spec
index 9180a68..382e5e8 100644
--- a/ghc-dlist.spec
+++ b/ghc-dlist.spec
@@ -1,13 +1,11 @@
-# For Haskell Packaging Guidelines see:
-# - https://fedoraproject.org/wiki/Packaging:Haskell
-# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+# cabal2spec-0.25
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
 %global pkg_name dlist
 
-# common part of summary for all the subpackages
 %global common_summary Haskell differences lists
 
-# main description used for all the subpackages
 %global common_description Differences lists: a list-like type supporting O(1) append.\
 This is particularly useful for efficient logging and pretty\
 printing, (e.g. with the Writer monad), where list append\
@@ -15,18 +13,18 @@ quickly becomes too expensive.
 
 Name:           ghc-%{pkg_name}
 Version:        0.5
-Release:        5%{?dist}.2
+Release:        6%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        BSD
+# BEGIN cabal2spec
 URL:            http://hackage.haskell.org/package/%{pkg_name}
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
 ExclusiveArch:  %{ghc_arches}
 BuildRequires:  ghc-Cabal-devel
-# macros for building haskell packages
-BuildRequires:  ghc-rpm-macros
-BuildRequires:  hscolour
+BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
+# END cabal2spec
 
 %description
 %{common_description}
@@ -43,12 +41,23 @@ BuildRequires:  hscolour
 %install
 %ghc_lib_install
 
-# define the shared, devel and prof subpkgs, devel scripts,
-# and filelists: ghc-dlist.files, ghc-dlist-devel.files
-%ghc_lib_package
+
+# devel subpackage
+%ghc_devel_package
+
+%ghc_devel_description
+
+
+%ghc_devel_post_postun
+
+
+%ghc_files LICENSE
 
 
 %changelog
+* Sun Mar 18 2012 Jens Petersen <petersen@redhat.com> - 0.5-6
+- update to cabal2spec-0.25
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5-5.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild