rpms/ghc-hashed-storage/devel ghc-hashed-storage.spec,1.7,1.8

Jens Petersen petersen at fedoraproject.org
Sun Jun 27 06:47:14 UTC 2010


Author: petersen

Update of /cvs/extras/rpms/ghc-hashed-storage/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16133

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


Index: ghc-hashed-storage.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-hashed-storage/devel/ghc-hashed-storage.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ghc-hashed-storage.spec	18 May 2010 10:21:39 -0000	1.7
+++ ghc-hashed-storage.spec	27 Jun 2010 06:47:13 -0000	1.8
@@ -26,11 +26,11 @@ Group:          System Environment/Libra
 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
 %{?ghc_pkg_deps:BuildRequires:  %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
 
 %description
@@ -48,18 +48,15 @@ This package provides the shared library
 
 
 %build
-%cabal_configure --ghc -p
-%cabal build
-%cabal haddock
+%ghc_lib_build
+
 
 %check
 # requires QuickCheck2
 
 %install
-%cabal_install
-%cabal_pkg_conf
-
-%ghc_gen_filelists
+rm -rf $RPM_BUILD_ROOT
+%ghc_lib_install
 
 
 %clean
@@ -67,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jun 27 2010 Jens Petersen <petersen at redhat.com> - 0.4.13-1
+- sync cabal2spec-0.22.1
+
 * Mon May 17 2010 Jens Petersen <petersen at redhat.com> - 0.4.13-1
 - update to 0.4.13 for darcs-2.4.3
 



More information about the scm-commits mailing list