[cabal-install/el6/master] update to f14 package

[Jens Petersen]

commit 951e15d9adcd30778e42fc5b1da789b21a2f54ac
Author: Jens Petersen <petersen at redhat.com>
Date:   Mon Oct 4 12:04:20 2010 +1000

    update to f14 package

 .gitignore         |    2 +-
 cabal-install.sh   |    8 ++++++++
 cabal-install.spec |   42 ++++++++++++++++++++++++++++++++++--------
 sources            |    2 +-
 4 files changed, 44 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cab5a91..e97fb27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-cabal-install-0.6.2.tar.gz
+cabal-install-0.8.2.tar.gz
diff --git a/cabal-install.sh b/cabal-install.sh
new file mode 100644
index 0000000..fdcf006
--- /dev/null
+++ b/cabal-install.sh
@@ -0,0 +1,8 @@
+CABALBIN=${HOME}/.cabal/bin
+
+if ! echo ${PATH} | /bin/grep -q ${CABALBIN} ; then
+    if [ -d ${CABALBIN} ]; then
+	PATH=${PATH}:${CABALBIN}
+    fi
+fi
+unset CABALBIN
diff --git a/cabal-install.spec b/cabal-install.spec
index 76d72b9..6c7317b 100644
--- a/cabal-install.spec
+++ b/cabal-install.spec
@@ -1,9 +1,12 @@
+# link with shared libs
+%bcond_without dynamic
+
 # ghc does not emit debug information
 %global debug_package %{nil}
 
 Name:           cabal-install
-# haskell-platform-2009.2.0.2 actually specifies 0.6.2
-Version:        0.6.4
+# part of haskell-platform-2010.2.0.0
+Version:        0.8.2
 Release:        1%{?dist}
 Summary:        Haskell package tool
 
@@ -11,10 +14,12 @@ Group:          Development/Tools
 License:        BSD
 URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{name}
 Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
+Source1:        cabal-install.sh
 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
+BuildRequires:  ghc-rpm-macros >= 0.7.0
 BuildRequires:  ghc-zlib-devel, ghc-HTTP-devel
 Requires:       ghc
 
@@ -29,17 +34,19 @@ installation of Haskell libraries and programs from Hackage.
 
 
 %build
-%cabal_configure
-%cabal build
+%ghc_bin_build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%cabal_install
+%ghc_bin_install
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 cp -p bash-completion/cabal $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
+install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
+
 rm ${RPM_BUILD_ROOT}/%{_docdir}/%{name}-%{version}/LICENSE
 
 
@@ -52,11 +59,30 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE README
 %{_bindir}/cabal
 %{_sysconfdir}/bash_completion.d
+%{_sysconfdir}/profile.d/cabal-install.sh
 
 
 %changelog
-* Fri Jan 15 2010 Jens Petersen <petersen at redhat.com> - 0.6.4-1
-- update to 0.6.4
+* Fri Jul 16 2010 Jens Petersen <petersen at redhat.com> - 0.8.2-1
+- update to 0.8.2 for haskell-platform-2010.2.0.0
+
+* Sun Jun 27 2010 Jens Petersen <petersen at redhat.com> - 0.8.0-5
+- sync cabal2spec-0.22.1
+
+* Wed May 19 2010 Jens Petersen <petersen at redhat.com> - 0.8.0-4
+- append ~/.cabal/bin to PATH (if dir exists) with new
+  /etc/profile.d/cabal-install.sh (#509699)
+
+* Tue Apr 27 2010 Jens Petersen <petersen at redhat.com> - 0.8.0-3
+- rebuild against ghc-6.12.2
+
+* Tue Mar 23 2010 Jens Petersen <petersen at redhat.com> - 0.8.0-2
+- rebuild against HTTP-4000.0.9 for haskell-platform-2010.1.0.0
+
+* Mon Jan 11 2010 Jens Petersen <petersen at redhat.com> - 0.8.0-1
+- update to 0.8.0 for ghc-6.12.1
+- add dynamic bcond
+- drop redundant buildroot and its install cleaning
 
 * Wed Sep 16 2009 Jens Petersen <petersen at redhat.com> - 0.6.2-6
 - really rebuild
diff --git a/sources b/sources
index da35a27..baed649 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8cb1c19233a9a114faf0eea7c46cb23e  cabal-install-0.6.2.tar.gz
+4abd0933dff361ff69ee9288a211e4e1  cabal-install-0.8.2.tar.gz