[ghc-network/el6/master] update to f14

[Jens Petersen]

commit 8c069f218375b866b8481219a63de3fa1cbf508c
Author: Jens Petersen <petersen at redhat.com>
Date:   Mon Oct 4 11:01:58 2010 +1000

    update to f14

 .gitignore       |    2 +-
 ghc-network.spec |  142 ++++++++++++++++-------------------------------------
 sources          |    2 +-
 3 files changed, 45 insertions(+), 101 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 294f5c2..c69c87c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-network-2.2.1.4.tar.gz
+network-2.2.1.7.tar.gz
diff --git a/ghc-network.spec b/ghc-network.spec
index f90b7b5..7a3e714 100644
--- a/ghc-network.spec
+++ b/ghc-network.spec
@@ -1,75 +1,41 @@
 %global pkg_name network
 
-%bcond_without doc
-%bcond_without prof
+%global common_summary Haskell %{pkg_name} library
 
-# override for ghc-6.10 since it has older network in extralibs
-%global ghcdocdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version}
+%global common_description A Haskell network library.
 
-# ghc does not emit debug information
+%global ghc_pkg_deps ghc-parsec-devel
+
+%bcond_without shared
+%bcond_without hscolour
+
+# debuginfo is not useful for ghc
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-# part of haskell-platform-2009.2.0.2
-Version:        2.2.1.4
-Release:        2%{?dist}
-Summary:        Haskell %{pkg_name} library
+# part of haskell-platform-2010.2.0.0
+Version:        2.2.1.7
+Release:        4%{?dist}
+Summary:        %{common_summary}
 
-Group:          Development/Libraries
+Group:          System Environment/Libraries
 License:        BSD
 URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/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-rpm-macros
-%if %{with doc}
-BuildRequires:  ghc-doc
-%endif
-%if %{with prof}
-BuildRequires:  ghc-prof
+BuildRequires:  ghc, ghc-doc, ghc-prof
+BuildRequires:  ghc-rpm-macros >= 0.8.1
+%if %{with hscolour}
+BuildRequires:  hscolour
 %endif
+%{?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.
-
-
-%package devel
-Summary:        Haskell %{pkg_name} library
-Group:          Development/Libraries
-Provides:       ghc-%{pkg_name} = %{version}-%{release}
-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
 
 
@@ -78,67 +44,45 @@ 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
+%ghc_lib_package -o 2.2.1.7-4
 
 
-%if %{with doc}
-%post doc
-%ghc_reindex_haddock
-%endif
-
-
-%preun devel
-if [ "$1" -eq 0 ] ; then
-  %ghc_unregister_pkg
-fi
-
-
-%if %{with doc}
-%postun doc
-if [ "$1" -eq 0 ] ; then
-  %ghc_reindex_haddock
-fi
-%endif
-
-
-%files devel -f %{name}-devel.files
-%defattr(-,root,root,-)
-%{_docdir}/%{name}-%{version}
-
+%changelog
+* Sat Sep  4 2010 Jens Petersen <petersen at redhat.com> - 2.2.1.7-4
+- update to latest macros, hscolour and drop doc pkg (cabal2spec-0.22.2)
+- part of haskell-platform-2010.2.0.0
 
-%if %{with doc}
-%files doc -f %{name}-doc.files
-%defattr(-,root,root,-)
-%endif
+* Fri Jun 25 2010 Jens Petersen <petersen at redhat.com> - 2.2.1.7-3
+- strip shared library (cabal2spec-0.21.4)
 
+* Mon Apr 26 2010 Jens Petersen <petersen at redhat.com> - 2.2.1.7-2
+- rebuild against ghc-6.12.2
+- condition ghc_lib_package
 
-%if %{with prof}
-%files prof -f %{name}-prof.files
-%defattr(-,root,root,-)
-%endif
+* Tue Mar 23 2010 Jens Petersen <petersen at redhat.com> - 2.2.1.7-1
+- update to 2.2.1.7 for haskell-platform-2010.1.0.0
 
+* Mon Jan 11 2010 Jens Petersen <petersen at redhat.com> - 2.2.1.5-1
+- update to 2.2.1.5 (haskell-platform-2009.3.1)
+- 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
+- build shared library
+- drop redundant buildroot and its install cleaning
 
-%changelog
 * Tue Sep 22 2009 Jens Petersen <petersen at redhat.com> - 2.2.1.4-2
 - version ghcdocdir to avoid conflict with ghc-doc-6.10.4 (#523884)
 
diff --git a/sources b/sources
index 6ea718c..634c679 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-639baaeeb9ccc2f2013bbfa3b376f14b  network-2.2.1.4.tar.gz
+566cfeef09ff4d2e52110ec4a9a9879b  network-2.2.1.7.tar.gz