rpms/ghc-HUnit/devel ghc-HUnit.spec,1.6,1.7

[Jens Petersen]

Author: petersen

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

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


Index: ghc-HUnit.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-HUnit/devel/ghc-HUnit.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ghc-HUnit.spec	27 Apr 2010 04:23:34 -0000	1.6
+++ ghc-HUnit.spec	27 Jun 2010 07:27:41 -0000	1.7
@@ -13,18 +13,18 @@ for Java.
 Name:           ghc-%{pkg_name}
 # part of haskell-platform-2010.1.0.0
 Version:        1.2.2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://hunit.sourceforge.net/
 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}
@@ -41,31 +41,29 @@ This package provides the shared library
 
 
 %build
-%cabal_configure --ghc -p
-%cabal build
-%cabal haddock
+%ghc_lib_build
 
 
-%install
-%cabal_install
-%cabal_pkg_conf
+%check
+%cabal test
 
-%ghc_gen_filelists
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%ghc_lib_install
 
 rm $RPM_BUILD_ROOT%{_bindir}/*-tests
 mv $RPM_BUILD_ROOT%{_datadir}/%{pkg_name}-%{version}/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
-%check
-dist/build/basic-tests/basic-tests
-dist/build/extended-tests/extended-tests
-dist/build/terminal-tests/terminal-tests
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jun 27 2010 Jens Petersen <petersen at redhat.com> - 1.2.2.1-3
+- sync cabal2spec-0.22.1
+
 * Tue Apr 27 2010 Jens Petersen <petersen at redhat.com> - 1.2.2.1-2
 - part of haskell-platform-2010.1.0.0
 - rebuild against ghc-6.12.2
@@ -74,6 +72,7 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Jan 11 2010 Jens Petersen <petersen at redhat.com> - 1.2.2.1-1
 - update 1.2.2.1 (current haskell-platform-2009.3.1)
 - remove test programs and move doc files to docdir
+- add check section for test programs
 - update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1:
 - drop doc and prof bcond
 - use common summary and common_description