rpms/ghc-zlib/devel ghc-zlib.spec,1.21,1.22

[Jens Petersen]

Author: petersen

Update of /cvs/pkgs/rpms/ghc-zlib/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24573

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


Index: ghc-zlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-zlib/devel/ghc-zlib.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ghc-zlib.spec	24 Apr 2010 08:25:01 -0000	1.21
+++ ghc-zlib.spec	26 Jun 2010 13:01:17 -0000	1.22
@@ -21,19 +21,18 @@ full zlib feature set.
 Name:           ghc-%{pkg_name}
 # part of haskell-platform-2010.1.0.0
 Version:        0.5.2.0
-Release:        2%{?dist}
+Release:        3%{?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
-%{?ghc_pkg_deps:BuildRequires:  %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
+BuildRequires:  ghc, ghc-doc, ghc-prof
+BuildRequires:  ghc-rpm-macros >= 0.7.0
 %{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
 
 %description
@@ -51,22 +50,21 @@ 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
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Sat Jun 26 2010 Jens Petersen <petersen at redhat.com> - 0.5.2.0-3
+- sync cabal2spec-0.22
+
 * Sat Apr 24 2010 Jens Petersen <petersen at redhat.com> - 0.5.2.0-2
 - part of haskell-platform-2010.1.0.0
 - rebuild against ghc-6.12.2