rpms/cabal-install/devel cabal-install.spec,1.14,1.15

[Jens Petersen]

Author: petersen

Update of /cvs/extras/rpms/cabal-install/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18451

Modified Files:
	cabal-install.spec 
Log Message:
sync cabal2spec-0.22.1


Index: cabal-install.spec
===================================================================
RCS file: /cvs/extras/rpms/cabal-install/devel/cabal-install.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- cabal-install.spec	19 May 2010 03:39:58 -0000	1.14
+++ cabal-install.spec	27 Jun 2010 07:06:01 -0000	1.15
@@ -7,7 +7,7 @@
 Name:           cabal-install
 # part of haskell-platform-2010.1.0.0
 Version:        0.8.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Haskell package tool
 
 Group:          Development/Tools
@@ -15,9 +15,11 @@ 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
 
@@ -32,12 +34,12 @@ installation of Haskell libraries and pr
 
 
 %build
-%cabal_configure
-%cabal build
+%ghc_bin_build
 
 
 %install
-%cabal_install
+rm -rf $RPM_BUILD_ROOT
+%ghc_bin_install
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 cp -p bash-completion/cabal $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
@@ -61,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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)