rpms/ghc-stm/devel ghc-stm.spec,1.2,1.3

[Jens Petersen]

Author: petersen

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

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


Index: ghc-stm.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-stm/devel/ghc-stm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ghc-stm.spec	27 Apr 2010 11:21:36 -0000	1.2
+++ ghc-stm.spec	27 Jun 2010 07:40:32 -0000	1.3
@@ -12,18 +12,18 @@
 Name:           ghc-%{pkg_name}
 # part of haskell-platform-2010.1.0.0
 Version:        2.1.1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        %{common_summary}
 
 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 >= 0.5.1
-BuildRequires:  ghc-doc
-BuildRequires:  ghc-prof
+BuildRequires:  ghc, ghc-doc, ghc-prof
+BuildRequires:  ghc-rpm-macros >= 0.7.0
 
 %description
 %{common_description}
@@ -40,16 +40,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
@@ -57,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jun 27 2010 Jens Petersen <petersen at redhat.com> - 2.1.1.2-4
+- sync cabal2spec-0.22.1
+
 * Tue Apr 27 2010 Jens Petersen <petersen at redhat.com> - 2.1.1.2-3
 - part of haskell-platform-2010.1.0.0
 - rebuild against ghc-6.12.2