- support hscolour'ing of src via haddock

- really remove redundant summary and description option flags

ghc-rpm-macros.ghc

@@ -93,7 +93,7 @@ Requires:       ghc-%{-n:%{-n*}}%{!-n:%{pkg_name}}-devel = %{-v:%{-v*}}%{!-v:%{v
 %{nil}
 
 # ghc_binlib_package [-n pkgname] [-c cdepslist] [-h pkgdepslist] [-l licensetag] [-v version]
-%ghc_binlib_package(n:c:h:l:v:s:d:)\
+%ghc_binlib_package(n:c:h:l:v:)\
 %define local_pkg_name %{-n:%{-n*}}%{!-n:%{pkg_name}}\
 %define ghc_pkg_name ghc-%{local_pkg_name}\
 %package -n %{ghc_pkg_name}\
@@ -112,11 +112,8 @@ This package provides the shared library.\
 
 %ghc_pkg_recache %{_bindir}/ghc-pkg recache --no-user-package-conf || :
 
-# for docs post and postun
-%ghc_reindex_haddock ( cd %{ghcdocbasedir}/libraries && [ -x "./gen_contents_index" ] && ./gen_contents_index ) || :
-
 # ghc_package_devel [-n pkgname] [-c cdepslist] [-h pkgdepslist] [-l licensetag] [-v version]
-%ghc_package_devel(n:c:h:l:v:s:d:)\
+%ghc_package_devel(n:c:h:l:v:)\
 %define local_pkg_name %{-n:%{-n*}}%{!-n:%{pkg_name}}\
 %define ghc_pkg_name ghc-%{local_pkg_name}\
 %package -n %{ghc_pkg_name}-devel\
@@ -145,11 +142,12 @@ This package contains the development files.\
 %defattr(-,root,root,-)\
 %{nil}
 
+# for docs post and postun
 # re-index haddock
 %ghc_reindex_haddock ( cd %{ghcdocbasedir}/libraries && [ -x "./gen_contents_index" ] && ./gen_contents_index ) || :
 
 # ghc_package_doc [-n pkgname] [-h pkgdepslist] [-l licensetag] [-v version]
-%ghc_package_doc(n:h:l:v:s:d:)\
+%ghc_package_doc(n:h:l:v:)\
 %define local_pkg_name %{-n:%{-n*}}%{!-n:%{pkg_name}}\
 %define ghc_pkg_name ghc-%{local_pkg_name}\
 %package -n %{ghc_pkg_name}-doc\
@@ -179,7 +177,7 @@ fi\
 %{nil}
 
 # ghc_package_prof [-n pkgname] [-c cdepslist] [-h pkgdepslist] [-l licensetag] [-v version]
-%ghc_package_prof(n:h:l:v:s:d:)\
+%ghc_package_prof(n:h:l:v:)\
 %define local_pkg_name %{-n:%{-n*}}%{!-n:%{pkg_name}}\
 %define ghc_pkg_name ghc-%{local_pkg_name}\
 %package -n %{ghc_pkg_name}-prof\
@@ -215,7 +213,7 @@ find $RPM_BUILD_ROOT -type f -exec sh -c "file {} | grep -q 'dynamically linked'
 %ghc_lib_build\
 %cabal_configure --ghc -p\
 %cabal build\
-%cabal haddock
+%cabal haddock %{?with_hscolour:--hyperlink-source}
 
 # ghc_bin_install
 %ghc_bin_install\

ghc-rpm-macros.spec

@@ -1,5 +1,5 @@
 Name:		ghc-rpm-macros
-Version:	0.7.0
+Version:	0.7.1
 Release:	1%{?dist}
 Summary:	Macros for building packages for GHC
 
@@ -48,6 +48,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jun 28 2010 Jens Petersen <petersen@redhat.com> - 0.7.1-1
+- support hscolour'ing of src from haddock
+- really remove redundant summary and description option flags
+
 * Sat Jun 26 2010 Jens Petersen <petersen@redhat.com> - 0.7.0-1
 - new ghc_bin_build, ghc_bin_install, ghc_lib_build, ghc_lib_install