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

[Jens Petersen]

Author: petersen

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

Modified Files:
	ghc-deepseq.spec 
Log Message:
sync cabal2spec-0.22


Index: ghc-deepseq.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-deepseq/devel/ghc-deepseq.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ghc-deepseq.spec	27 Apr 2010 03:04:15 -0000	1.2
+++ ghc-deepseq.spec	26 Jun 2010 13:42:33 -0000	1.3
@@ -12,7 +12,7 @@
 Name:           ghc-%{pkg_name}
 # part of haskell-platform-2010.1.0.0
 Version:        1.1.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -22,11 +22,8 @@ Source0:        http://hackage.haskell.o
 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
-%{?ghc_pkg_deps:BuildRequires:  %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
-%{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
+BuildRequires:  ghc, ghc-doc, ghc-prof
+BuildRequires:  ghc-rpm-macros >= 0.7.0
 
 %description
 %{common_description}
@@ -43,17 +40,12 @@ This package provides the shared library
 
 
 %build
-%cabal_configure --ghc -p
-%cabal build
-%cabal haddock
+%ghc_lib_build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%cabal_install
-%cabal_pkg_conf
-
-%ghc_gen_filelists
+%ghc_lib_install
 
 
 %clean
@@ -61,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jun 26 2010 Jens Petersen <petersen at redhat.com> - 1.1.0.0-3
+- sync cabal2spec-0.22
+
 * Tue Apr 27 2010 Jens Petersen <petersen at redhat.com> - 1.1.0.0-2
 - part of haskell-platform-2010.1.0.0
 - rebuild against ghc-6.12.2