[hledger] allow building with cmdargs-0.10 and split-0.2; re-enable dynamic; update with cabal-rpm

[Jens Petersen]

commit fb4ac36bf68b9498d102b85f47cf62f5e974b128
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Nov 9 18:00:42 2012 +0900

    allow building with cmdargs-0.10 and split-0.2; re-enable dynamic; update with cabal-rpm

 hledger.spec |   35 ++++++++++++++++++++++-------------
 1 files changed, 22 insertions(+), 13 deletions(-)
---
diff --git a/hledger.spec b/hledger.spec
index 58708a9..a3d795b 100644
--- a/hledger.spec
+++ b/hledger.spec
@@ -1,4 +1,3 @@
-# cabal2spec-0.25.4
 # https://fedoraproject.org/wiki/Packaging:Haskell
 # https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
@@ -14,34 +13,38 @@ ledger.  hledger aims to be a practical, accessible tool \
 for end users and a useful library for finance-minded \
 haskell programmers.
 
-%global ghc_without_dynamic 1
-
-
 Name:           %{pkg_name}
 Version:        0.17
-Release:        2%{?dist}
-Summary:        Haskell %{pkg_name}
+Release:        3%{?dist}
+Summary:        %{common_summary}
 
-Group:          Applications/Productivity
 License:        GPLv3
-# BEGIN cabal2spec
 URL:            http://hackage.haskell.org/package/%{name}
 Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
-ExclusiveArch:  %{ghc_arches}
+
 BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
-# END cabal2spec
+BuildRequires:  ghc-rpm-macros
+# Begin cabal-rpm deps:
 BuildRequires:  ghc-HUnit-devel
 BuildRequires:  ghc-cabal-file-th-devel
+BuildRequires:  ghc-cmdargs-devel
+BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-csv-devel
+BuildRequires:  ghc-directory-devel
+BuildRequires:  ghc-filepath-devel
 BuildRequires:  ghc-haskeline-devel
 BuildRequires:  ghc-hledger-lib-devel
 BuildRequires:  ghc-mtl-devel
+BuildRequires:  ghc-old-locale-devel
+BuildRequires:  ghc-old-time-devel
 BuildRequires:  ghc-parsec-devel
+BuildRequires:  ghc-process-devel
 BuildRequires:  ghc-regexpr-devel
 BuildRequires:  ghc-safe-devel
 BuildRequires:  ghc-split-devel
+BuildRequires:  ghc-time-devel
 BuildRequires:  ghc-utf8-string-devel
+# End cabal-rpm deps
 
 %description
 %{common_description}
@@ -50,6 +53,9 @@ BuildRequires:  ghc-utf8-string-devel
 %prep
 %setup -q
 
+cabal-tweak-dep-ver cmdargs "< 0.10" "<0.11"
+cabal-tweak-dep-ver split "== 0.1.*" "== 0.2.*"
+
 
 %build
 %ghc_lib_build
@@ -59,13 +65,11 @@ BuildRequires:  ghc-utf8-string-devel
 %ghc_lib_install
 
 
-# library subpackage
 %ghc_package
 
 %ghc_description
 
 
-# devel subpackage
 %ghc_devel_package
 
 %ghc_devel_description
@@ -83,6 +87,11 @@ BuildRequires:  ghc-utf8-string-devel
 
 
 %changelog
+* Fri Nov  9 2012 Jens Petersen <petersen at redhat.com> - 0.17-3
+- re-enable dynamic executable
+- allow building with cmdargs-0.10 and split-0.2
+- update with cabal-rpm
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.17-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild