From 83df7fa0a3af06b53d866320b50811487b096d48 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: May 13 2012 01:52:34 +0000
Subject: merge f17 for haskell-platform-2011.4


---

diff --git a/.gitignore b/.gitignore
index 838f440..e8c5bdf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 fgl-5.4.2.3.tar.gz
+/fgl-5.4.2.4.tar.gz
diff --git a/ghc-fgl.spec b/ghc-fgl.spec
index dd8d6a7..b53c440 100644
--- a/ghc-fgl.spec
+++ b/ghc-fgl.spec
@@ -4,35 +4,25 @@
 
 %global common_description Martin Erwig's Functional Graph Library.
 
-%global ghc_pkg_deps ghc-mtl-devel
-
-%bcond_without shared
-
-# debuginfo is not useful for ghc
-%global debug_package %{nil}
-
 Name:           ghc-%{pkg_name}
-# part of haskell-platform-2010.2.0.0
-Version:        5.4.2.3
-Release:        1%{?dist}
+# part of haskell-platform-2011.4.0.0
+Version:        5.4.2.4
+Release:        2%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        BSD
-URL:            http://web.engr.oregonstate.edu/~erwig/fgl/haskell/
+# 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
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# fedora ghc archs:
-ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc, ghc-doc, ghc-prof
-BuildRequires:  ghc-rpm-macros >= 0.8.0
-%{?ghc_pkg_deps:BuildRequires:  %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
+ExclusiveArch:  %{ghc_arches}
+BuildRequires:  ghc-Cabal-devel
+BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
+# END cabal2spec
+BuildRequires:  ghc-mtl-prof
 
 %description
 %{common_description}
-%if %{with shared}
-This package provides the shared library.
-%endif
 
 
 %prep
@@ -44,18 +34,47 @@ This package provides the shared library.
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %ghc_lib_install
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%ghc_lib_package
 
 
-%ghc_lib_package -o 5.4.2.3-1
+%changelog
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.4.2.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
+* Mon Dec 19 2011 Jens Petersen <petersen@redhat.com> - 5.4.2.4-1
+- update to 5.4.2.4 for haskell-platform-2011.4
+
+* Thu Oct 20 2011 Marcela Mašláňová <mmaslano@redhat.com> - 5.4.2.3-8.2
+- rebuild with new gmp without compat lib
+
+* Tue Oct 11 2011 Peter Schiffer <pschiffe@redhat.com> - 5.4.2.3-8.1
+- rebuild with new gmp
+
+* Tue Jun 21 2011 Jens Petersen <petersen@redhat.com> - 5.4.2.3-8
+- ghc_arches replaces ghc_excluded_archs
+
+* Mon Jun 20 2011 Jens Petersen <petersen@redhat.com> - 5.4.2.3-7
+- BR ghc-Cabal-devel and use ghc_excluded_archs
+
+* Fri May 27 2011 Jens Petersen <petersen@redhat.com> - 5.4.2.3-6
+- update to cabal2spec-0.23
+
+* Thu Mar 10 2011 Fabio M. Di Nitto <fdinitto@redhat.com> - 5.4.2.3-5
+- Enable build on sparcv9
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.4.2.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Jan 18 2011 Jens Petersen <petersen@redhat.com> - 5.4.2.3-3
+- update to cabal2spec-0.22.4
+
+* Thu Nov 25 2010 Jens Petersen <petersen@redhat.com> - 5.4.2.3-2
+- add hscolour
+- drop -o obsoletes
 
-%changelog
 * Fri Jul 16 2010 Jens Petersen <petersen@redhat.com> - 5.4.2.3-1
 - update to 5.4.2.3 for haskell-platform-2010.2.0.0
 - obsolete doc subpackage (ghc-rpm-macros-0.8.0)
diff --git a/sources b/sources
index dd7b7dd..eb830f6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-29ccab8bebed16a8d7346c3ed52c5d9c  fgl-5.4.2.3.tar.gz
+6b5430f4a5ad374bc4351acaf3d81e4f  fgl-5.4.2.4.tar.gz