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

@@ -22,7 +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-dlist-prof, ghc-containers-prof
 
 %description
 %{common_description}
@@ -49,7 +49,7 @@ BuildRequires:   ghc-dlist-prof, ghc-containers-prof
 %ghc_devel_post_postun
 
 
-%ghc_files
+%ghc_files 
 
 
 %changelog
@@ -57,6 +57,15 @@ BuildRequires:   ghc-dlist-prof, ghc-containers-prof
 - updated to 0.4.0
 - spec file updated to cabal2spec-0.25.4
 
+* Sun Mar 18 2012 Jens Petersen <petersen@redhat.com> - 0.3.0-3
+- update to cabal2spec-0.25
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@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@redhat.com> - 0.3.0-1.1
+- rebuild with new gmp without compat lib
+
 * Sat Sep 10 2011 Lakshmi Narasimhan T V <lakshminaras2002@gmail.com> - 0.3.0-1
 - License is BSD.