- ghc-rpm-macros-0.8.1 for doc obsoletes

- part of haskell-platform-2010.2.0.0
- add hscolour
- datadir filelist cleanup

ghc-HUnit.spec

@@ -6,14 +6,15 @@
 for Java.
 
 %bcond_without shared
+%bcond_without hscolour
 
 # debuginfo is not useful for ghc
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-# part of haskell-platform-2010.1.0.0
+# part of haskell-platform-2010.2.0.0
 Version:        1.2.2.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -24,7 +25,10 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
 BuildRequires:  ghc, ghc-doc, ghc-prof
-BuildRequires:  ghc-rpm-macros >= 0.7.0
+BuildRequires:  ghc-rpm-macros >= 0.8.1
+%if %{with hscolour}
+BuildRequires:  hscolour
+%endif
 
 %description
 %{common_description}
@@ -33,9 +37,6 @@ This package provides the shared library.
 %endif
 
 
-%{?ghc_lib_package}
-
-
 %prep
 %setup -q -n %{pkg_name}-%{version}
 
@@ -52,15 +53,28 @@ This package provides the shared library.
 rm -rf $RPM_BUILD_ROOT
 %ghc_lib_install
 
+# remove unwanted files
 rm $RPM_BUILD_ROOT%{_bindir}/*-tests
-mv $RPM_BUILD_ROOT%{_datadir}/%{pkg_name}-%{version}/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+rm -r $RPM_BUILD_ROOT%{_datadir}/%{pkg_name}-%{version}
+
+echo %doc LICENSE >> %{name}.files
+echo %doc README doc/Guide.html examples/Example.hs >> %{name}-devel.files
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%ghc_lib_package -o 1.2.2.1-4
+
+
 %changelog
+* Sat Jul 31 2010 Jens Petersen <petersen@redhat.com> - 1.2.2.1-4
+- ghc-rpm-macros-0.8.1 for doc obsoletes
+- part of haskell-platform-2010.2.0.0
+- add hscolour
+- datadir filelist cleanup
+
 * Sun Jun 27 2010 Jens Petersen <petersen@redhat.com> - 1.2.2.1-3
 - sync cabal2spec-0.22.1