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

[Jens Petersen]

commit d335514b8fe6127e49154d7301405ea4b37bdb5f
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Oct 7 13:32:10 2010 +1000

    update to f14 package

 .gitignore   |    2 +-
 ghc-cgi.spec |  147 +++++++++++++++++----------------------------------------
 sources      |    2 +-
 3 files changed, 46 insertions(+), 105 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index de6ad34..7417490 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-cgi-3001.1.7.1.tar.gz
+cgi-3001.1.7.3.tar.gz
diff --git a/ghc-cgi.spec b/ghc-cgi.spec
index 0fe1cc7..cdf434c 100644
--- a/ghc-cgi.spec
+++ b/ghc-cgi.spec
@@ -1,79 +1,37 @@
 %global pkg_name cgi
 
-%bcond_without doc
-%bcond_without prof
+%global common_summary Haskell %{pkg_name} library
 
-# ghc does not emit debug information
+%global common_description A Haskell library for ghc for writing CGI programs.
+
+%global ghc_pkg_deps ghc-mtl-devel, ghc-network-devel, ghc-parsec-devel, ghc-xhtml-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:        3001.1.7.1
-Release:        2%{?dist}
-Summary:        Haskell %{pkg_name} library
+# part of haskell-platform-2010.2.0.0
+Version:        3001.1.7.3
+Release:        1%{?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
-BuildRequires:  ghc-network-devel
-%if %{with doc}
-BuildRequires:  ghc-doc
-BuildRequires:  ghc-network-doc
-%endif
-%if %{with prof}
-BuildRequires:  ghc-prof
-BuildRequires:  ghc-network-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
-for writing CGI programs.
-
-
-%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}
-Requires:       ghc-network-devel
-
-%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}
-Requires:       ghc-network-doc
-
-%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}
-Requires:       ghc-network-prof
-
-%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
 
 
@@ -82,67 +40,50 @@ 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 3001.1.7.3-1
 
 
-%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
+%changelog
+* Fri Jul 16 2010 Jens Petersen <petersen at redhat.com> - 3001.1.7.3-1
+- update to 3001.1.7.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> - 3001.1.7.2-4
+- sync cabal2spec-0.22
 
-%files devel -f %{name}-devel.files
-%defattr(-,root,root,-)
-%{_docdir}/%{name}-%{version}
+* Tue Apr 27 2010 Jens Petersen <petersen at redhat.com> - 3001.1.7.2-3
+- rebuild against ghc-6.12.2
 
+* Wed Mar 24 2010 Jens Petersen <petersen at redhat.com> - 3001.1.7.2-2
+- rebuild against network-2.2.1.7
 
-%if %{with doc}
-%files doc -f %{name}-doc.files
-%defattr(-,root,root,-)
-%endif
+* Tue Mar 23 2010 Jens Petersen <petersen at redhat.com> - 3001.1.7.2-1
+- update to 3001.1.7.2 for haskell-platform-2010.1.0.0
 
+* Wed Jan 13 2010 Jens Petersen <petersen at redhat.com> - 3001.1.7.1-4
+- 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
+- buildrequires mtl, parsec, xhtml
 
-%if %{with prof}
-%files prof -f %{name}-prof.files
-%defattr(-,root,root,-)
-%endif
+* Mon Nov 16 2009 Jens Petersen <petersen at redhat.com> - 3001.1.7.1-3
+- use ghc_pkg_ver macro for network version
 
-
-%changelog
 * Mon Sep 28 2009 Jens Petersen <petersen at redhat.com> - 3001.1.7.1-2
 - buildrequire the new ghc-network library
 
diff --git a/sources b/sources
index c2dddeb..9ffb5bb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-02b1d2fe6f271a17c1eb8b897fbd1d7f  cgi-3001.1.7.1.tar.gz
+1a6aa04d9b41d925d35bd1df704d1dc4  cgi-3001.1.7.3.tar.gz