rpms/darcs/devel darcs.spec,1.65,1.66

[Jens Petersen]

Author: petersen

Update of /cvs/extras/rpms/darcs/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23708

Modified Files:
	darcs.spec 
Log Message:
sync cabal2spec-0.22.1


Index: darcs.spec
===================================================================
RCS file: /cvs/extras/rpms/darcs/devel/darcs.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- darcs.spec	25 May 2010 15:21:34 -0000	1.65
+++ darcs.spec	27 Jun 2010 07:51:29 -0000	1.66
@@ -17,6 +17,7 @@ consistent and powerful theory of patche
 
 %global ghc_pkg_c_deps curl-devel
 
+# dynamic + prof breaks cabal looking for p_dyn
 %bcond_without shared
 
 # debuginfo is not useful for ghc
@@ -35,9 +36,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 # fedora ghc archs:
 ExclusiveArch:	%{ix86} x86_64 ppc alpha
 Obsoletes:      darcs-server < 2.2.1-6
-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}}
 # for make check
@@ -51,13 +51,11 @@ BuildRequires:  which
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
 
 %build
-%cabal_configure -p
-%cabal build
-%cabal haddock
+%ghc_lib_build
 
 
 %check
@@ -66,16 +64,11 @@ BuildRequires:  which
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%cabal_install
-%cabal_pkg_conf
+%ghc_lib_install
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 cp -p contrib/darcs_completion $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/darcs
 
-#%__strip $RPM_BUILD_ROOT%{_bindir}/%{name}
-
-%ghc_gen_filelists
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -92,7 +85,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu May 20 2010 Jens Petersen <petersen at redhat.com> - 2.4.4-1
+* Sun Jun 27 2010 Jens Petersen <petersen at redhat.com> - 2.4.4-1
+- sync cabal2spec-0.22.1
+
+* Thu Jun  3 2010 Jens Petersen <petersen at redhat.com> - 2.4.4-1
 - update to 2.4.4
 
 * Tue May 18 2010 Jens Petersen <petersen at redhat.com> - 2.4.3-1