[ghc-data-default: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/ghc-data-default

[narasim]

commit a6380feed4e2213f2b61c4fdb9bef774d68cbcc8
Merge: 4a235ba a660b1c
Author: Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com>
Date:   Mon Apr 9 23:09:33 2012 +0530

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/ghc-data-default
    
    Conflicts:
    	ghc-data-default.spec
    
    	modified:   ghc-data-default.spec

 ghc-data-default.spec |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)
---
diff --cc ghc-data-default.spec
index df61396,b403ba8..919ce6b
--- a/ghc-data-default.spec
+++ b/ghc-data-default.spec
@@@ -22,7 -24,8 +22,7 @@@ ExclusiveArch:  %{ghc_arches
  BuildRequires:  ghc-Cabal-devel
  BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
  # END cabal2spec
- BuildRequires:   ghc-dlist-prof, ghc-containers-prof
 -BuildRequires:  ghc-containers-prof
 -BuildRequires:  ghc-dlist-prof
++BuildRequires:  ghc-dlist-prof, ghc-containers-prof
  
  %description
  %{common_description}
@@@ -49,14 -52,19 +49,23 @@@
  %ghc_devel_post_postun
  
  
- %ghc_files
 -%ghc_files LICENSE
++%ghc_files 
  
  
  %changelog
 +* Mon Apr  9 2012 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 0.4.0-1
 +- updated to 0.4.0
 +- spec file updated to cabal2spec-0.25.4
 +
+ * Sun Mar 18 2012 Jens Petersen <petersen at redhat.com> - 0.3.0-3
+ - update to cabal2spec-0.25
+ 
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.0-2.1
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
+ * Mon Oct 24 2011 Marcela Mašláňová <mmaslano at redhat.com> - 0.3.0-1.1
+ - rebuild with new gmp without compat lib
+ 
  * Sat Sep 10 2011 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 0.3.0-1
  - License is BSD.