[ghc-fgl/el6/master] update to f14 package

[Jens Petersen]

commit 53ed236d97b9e37161c0fae7b7a3c5cff2b972bc
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Oct 7 13:15:47 2010 +1000

    update to f14 package

 .gitignore   |    2 +-
 ghc-fgl.spec |  140 ++++++++++++++++++----------------------------------------
 sources      |    2 +-
 3 files changed, 45 insertions(+), 99 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fbb22b7..838f440 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-fgl-5.4.2.2.tar.gz
+fgl-5.4.2.3.tar.gz
diff --git a/ghc-fgl.spec b/ghc-fgl.spec
index 0756d82..dd8d6a7 100644
--- a/ghc-fgl.spec
+++ b/ghc-fgl.spec
@@ -1,73 +1,37 @@
 %global pkg_name fgl
 
-%bcond_without doc
-%bcond_without prof
+%global common_summary Haskell Functional Graph Library
 
-# ghc does not emit debug information
+%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-2009.2.0.2
-Version:        5.4.2.2
+# part of haskell-platform-2010.2.0.0
+Version:        5.4.2.3
 Release:        1%{?dist}
-Summary:        Haskell %{pkg_name} library
+Summary:        %{common_summary}
 
-Group:          Development/Libraries
+Group:          System Environment/Libraries
 License:        BSD
 URL:            http://web.engr.oregonstate.edu/~erwig/fgl/haskell/
 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
-BuildRequires:  ghc-rpm-macros
-%if %{with doc}
-BuildRequires:  ghc-doc
-%endif
-%if %{with prof}
-BuildRequires:  ghc-prof
-%endif
+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")}
 
 %description
-This package provides the Haskell %{pkg_name} library for ghc.  This
-is a library of types and functions for addressing graph problems.
-
-
-%package devel
-Summary:        Haskell %{pkg_name} library
-Group:          Development/Libraries
-Requires:       ghc = %{ghc_version}
-Requires(post): ghc = %{ghc_version}
-Requires(preun): ghc = %{ghc_version}
-
-%description devel
-This package contains the development files for %{name}
-built for ghc-%{ghc_version}.
-
-
-%if %{with doc}
-%package doc
-Summary:        Documentation for %{name}
-Group:          Development/Libraries
-Requires:       ghc-doc = %{ghc_version}
-Requires(post): ghc-doc = %{ghc_version}
-Requires(postun): ghc-doc = %{ghc_version}
-
-%description doc
-This package contains development documentation files for the %{name} library.
-%endif
-
-
-%if %{with prof}
-%package prof
-Summary:        Profiling libraries for %{name}
-Group:          Development/Libraries
-Requires:       %{name}-devel = %{version}-%{release}
-Requires:       ghc-prof = %{ghc_version}
-
-%description prof
-This package contains profiling libraries for %{name}
-built for ghc-%{ghc_version}.
+%{common_description}
+%if %{with shared}
+This package provides the shared library.
 %endif
 
 
@@ -76,66 +40,48 @@ built for ghc-%{ghc_version}.
 
 
 %build
-%cabal_configure --ghc %{?with_prof:-p}
-%cabal build
-%if %{with doc}
-%cabal haddock
-%endif
-%ghc_gen_scripts
+%ghc_lib_build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%cabal_install
-%ghc_install_scripts
-%ghc_gen_filelists %{name}
+%ghc_lib_install
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post devel
-%ghc_register_pkg
-
-
-%if %{with doc}
-%post doc
-%ghc_reindex_haddock
-%endif
-
-
-%preun devel
-if [ "$1" -eq 0 ] ; then
-  %ghc_unregister_pkg
-fi
+%ghc_lib_package -o 5.4.2.3-1
 
 
-%if %{with doc}
-%postun doc
-if [ "$1" -eq 0 ] ; then
-  %ghc_reindex_haddock
-fi
-%endif
+%changelog
+* Fri Jul 16 2010 Jens Petersen <petersen at 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)
 
+* Sat Jun 26 2010 Jens Petersen <petersen at redhat.com> - 5.4.2.2-6
+- strip shared library (cabal2spec-0.21.4)
 
-%files devel -f %{name}-devel.files
-%defattr(-,root,root,-)
-%{_docdir}/%{name}-%{version}
+* Tue Apr 27 2010 Jens Petersen <petersen at redhat.com> - 5.4.2.2-5
+- part of haskell-platform-2010.1.0.0
+- rebuild against ghc-6.12.2
+- condition ghc_lib_package
 
+* Tue Jan 12 2010 Jens Petersen <petersen at redhat.com> - 5.4.2.2-4
+- rebuild against ghc-mtl package
 
-%if %{with doc}
-%files doc -f %{name}-doc.files
-%defattr(-,root,root,-)
-%endif
+* Mon Jan 11 2010 Jens Petersen <petersen at redhat.com> - 5.4.2.2-3
+- update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1:
+- drop doc and prof bcond
+- use common_summary and common_description
+- use ghc_lib_package and ghc_pkg_deps
 
+* Sat Dec 26 2009 Jens Petersen <petersen at redhat.com> - 5.4.2.2-2
+- update for ghc-6.12.1: add shared library support
+- use new ghc*_requires macros: needs ghc-rpm-macros 0.4.0
+- add common_summary and common_description
+- buildrequires ghc-mtl
 
-%if %{with prof}
-%files prof -f %{name}-prof.files
-%defattr(-,root,root,-)
-%endif
-
-
-%changelog
 * Wed Aug 12 2009 Bryan O'Sullivan <bos at serpentine.com> - 5.4.2.2-1
 - initial packaging for Fedora created by cabal2spec
diff --git a/sources b/sources
index d9f692a..dd7b7dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ad49ce31af04c0fd9c6dbfa52801ff83  fgl-5.4.2.2.tar.gz
+29ccab8bebed16a8d7346c3ed52c5d9c  fgl-5.4.2.3.tar.gz