rpms/ghc-editline/devel ghc-editline.spec,1.16,1.17

[Jens Petersen]

Author: petersen

Update of /cvs/extras/rpms/ghc-editline/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25498

Modified Files:
	ghc-editline.spec 
Log Message:
sync cabal2spec-0.22.1


Index: ghc-editline.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-editline/devel/ghc-editline.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ghc-editline.spec	27 Apr 2010 03:09:06 -0000	1.16
+++ ghc-editline.spec	27 Jun 2010 08:07:04 -0000	1.17
@@ -19,18 +19,18 @@ provides a subset of the functionality o
 Name:           ghc-%{pkg_name}
 # was part of haskell-platform-2009.2.0.2
 Version:        0.2.1.0
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://code.haskell.org/editline
 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 >= 0.5.1
-BuildRequires:  ghc-doc
-BuildRequires:  ghc-prof
+BuildRequires:  ghc, ghc-doc, ghc-prof
+BuildRequires:  ghc-rpm-macros >= 0.7.0
 %{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
 
 %description
@@ -48,16 +48,12 @@ This package provides the shared library
 
 
 %build
-%cabal_configure --ghc -p
-%cabal build
-%cabal haddock
+%ghc_lib_build
 
 
 %install
-%cabal_install
-%cabal_pkg_conf
-
-%ghc_gen_filelists
+rm -rf $RPM_BUILD_ROOT
+%ghc_lib_install
 
 
 %clean
@@ -65,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %Changelog
+* Sun Jun 27 2010 Jens Petersen <petersen at redhat.com> - 0.2.1.0-16
+- sync cabal2spec-0.22.1
+
 * Tue Apr 27 2010 Jens Petersen <petersen at redhat.com> - 0.2.1.0-15
 - rebuild against ghc-6.12.2
 - condition ghc_lib_package