rpms/ghc-haskell-src-exts/F-11 ghc-haskell-src-exts.spec,1.3,1.4

[Jens Petersen]

Author: petersen

Update of /cvs/pkgs/rpms/ghc-haskell-src-exts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9667

Modified Files:
	ghc-haskell-src-exts.spec 
Log Message:
backport from devel for ghc-6.10.3 rebuild


Index: ghc-haskell-src-exts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-haskell-src-exts/F-11/ghc-haskell-src-exts.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ghc-haskell-src-exts.spec	19 Mar 2009 21:26:08 -0000	1.3
+++ ghc-haskell-src-exts.spec	2 Jun 2009 13:53:46 -0000	1.4
@@ -1,8 +1,4 @@
 %global pkg_name haskell-src-exts
-%global ghc_version 6.10.1
-
-%global pkg_libdir %{_libdir}/ghc-%{ghc_version}/%{pkg_name}-%{version}
-%global pkg_docdir %{_docdir}/ghc/libraries/%{pkg_name}-%{version}
 
 %bcond_without doc
 %bcond_without prof
@@ -12,7 +8,7 @@
 
 Name:           ghc-%{pkg_name}
 Version:        0.4.8
-Release:        4%{?dist}
+Release:        7%{?dist}
 Summary:        Library for Manipulating Haskell source
 Group:          Development/Libraries
 License:        BSD
@@ -21,18 +17,16 @@ Source0:        http://hackage.haskell.o
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc = %{ghc_version}
+BuildRequires:  ghc, ghc-rpm-macros
 %if %{with doc}
-BuildRequires:  ghc-doc = %{ghc_version}
-%endif
-%if %{with prof}
-BuildRequires:  ghc-prof = %{ghc_version}
+BuildRequires:  ghc-doc
 %endif
 BuildRequires:  ghc-cpphs-devel
+%if %{with prof}
+BuildRequires:  ghc-prof
 BuildRequires:  ghc-cpphs-prof
+%endif
 BuildRequires:  happy
-Requires:       cpphs
-Requires:       happy
 
 %description
 Haskell-Source with Extensions (HSE, haskell-src-exts) is an extension
@@ -84,7 +78,8 @@ Requires: ghc-prof = %{ghc_version}
 Requires: ghc-cpphs-prof
 
 %description prof
-This package contains profiling libraries for %{name}.
+This package contains profiling libraries for %{name}
+built for ghc-%{ghc_version}.
 %endif
 
 
@@ -93,7 +88,7 @@ This package contains profiling librarie
 
 
 %build
-%cabal_configure --ghc %{!?without_prof:-p}
+%cabal_configure --ghc %{?with_prof:-p}
 %cabal build
 %if %{with doc}
 %cabal haddock
@@ -138,14 +133,12 @@ fi
 
 %files devel -f %{name}-devel.files
 %defattr(-,root,root,-)
-#%%doc LICENSE
 %{_docdir}/%{name}-%{version}
 
 
 %if %{with doc}
-%files doc
+%files doc -f %{name}-doc.files
 %defattr(-,root,root,-)
-%{pkg_docdir}
 %endif
 
 
@@ -156,6 +149,16 @@ fi
 
 
 %changelog
+* Tue Jun  2 2009 Jens Petersen <petersen at redhat.com> - 0.4.8-7
+- drop superfluous cpphs and happy requires
+
+* Sun May 24 2009 Jens Petersen <petersen at redhat.com> - 0.4.8-6
+- buildrequires ghc-rpm-macros (cabal2spec-0.16)
+
+* Fri Apr 24 2009 Jens Petersen <petersen at redhat.com> - 0.4.8-5
+- sync with cabal2spec-0.15
+- buildrequires >= 6.10.2-3 for latest macros
+
 * Thu Mar 19 2009 Conrad Meyer <konrad at tylerc.org> - 0.4.8-4
 - Update to new cabal2spec template.