rpms/ghc-GLUT/devel ghc-GLUT.spec,1.9,1.10

[Jens Petersen]

Author: petersen

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

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


Index: ghc-GLUT.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-GLUT/devel/ghc-GLUT.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ghc-GLUT.spec	10 Jun 2010 10:19:39 -0000	1.9
+++ ghc-GLUT.spec	27 Jun 2010 07:18:29 -0000	1.10
@@ -17,18 +17,18 @@ This is a set of bindings to the C %{pkg
 Name:           ghc-%{pkg_name}
 # part of haskell-platform-2010.1.0.0
 Version:        2.1.2.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://www.haskell.org/haskellwiki/Opengl
 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_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}}
 Patch1:         ghc-GLUT-extralibs.patch
@@ -49,16 +49,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
@@ -66,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jun 27 2010 Jens Petersen <petersen at redhat.com> - 2.1.2.1-4
+- sync cabal2spec-0.22.1
+
 * Thu Jun 10 2010 Jens Petersen <petersen at redhat.com> - 2.1.2.1-3
 - add extralibs glut in .cabal file to fix ghci linking
   (reported by Ian Collier, #601640)