diff --git a/ghc-X11.spec b/ghc-X11.spec
index 638fccb..1837002 100644
--- a/ghc-X11.spec
+++ b/ghc-X11.spec
@@ -1,19 +1,15 @@
 %global pkg_name X11
-%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 prof
 %bcond_without doc
+%bcond_without prof
 
 # ghc does not emit debug information
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
 Version:        1.4.5
-Release:        6%{?dist}
-Summary:        Haskell %{pkg_name} librar
+Release:        7%{?dist}
+Summary:        Haskell %{pkg_name} library
 
 Group:          Development/Libraries
 License:        BSD
@@ -22,12 +18,12 @@ Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{versio
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc = %{ghc_version}
+BuildRequires:  ghc
 %if %{with doc}
-BuildRequires:  ghc-doc = %{ghc_version}
+BuildRequires:  ghc-doc
 %endif
 %if %{with prof}
-BuildRequires:  ghc-prof = %{ghc_version}
+BuildRequires:  ghc-prof
 %endif
 BuildRequires: libXinerama-devel, libX11-devel, libXext-devel
 
@@ -41,23 +37,19 @@ Manual", available online at <http://tronche.com/gui/x/xlib/>.
 %package devel
 Summary:        Haskell %{pkg_name} library
 Group:          Development/Libraries
-Requires:       ghc = %{ghc_version}
-Requires(post): ghc = %{ghc_version}
-Requires(preun): ghc = %{ghc_version}
+%ghcrequires ghc post preun
 Requires:       libXinerama-devel, libX11-devel, libXext-devel
 
 %description devel
 This package contains the development files for %{name}
-built for ghc-%{ghc_version}.
+built for ghc.
 
 
 %if %{with doc}
 %package doc
 Summary: Documentation for %{name}
 Group: Development/Libraries
-Requires: ghc-doc = %{ghc_version}
-Requires(post): ghc-doc = %{ghc_version}
-Requires(postun): ghc-doc = %{ghc_version}
+%ghcrequires ghc-doc post postun
 
 %description doc
 This package contains development documentation files for the %{name} library.
@@ -69,7 +61,7 @@ This package contains development documentation files for the %{name} library.
 Summary: Profiling libraries for %{name}
 Group: Development/Libraries
 Requires: %{name}-devel = %{version}-%{release}
-Requires: ghc-prof = %{ghc_version}
+%ghcrequires ghc-prof
 
 %description prof
 This package contains profiling libraries for %{name}.
@@ -81,7 +73,7 @@ This package contains profiling libraries for %{name}.
 
 
 %build
-%cabal_configure --ghc %{!?without_prof:-p}
+%cabal_configure --ghc %{?with_prof:-p}
 %cabal build
 %if %{with doc}
 %cabal haddock
@@ -130,9 +122,8 @@ fi
 
 
 %if %{with doc}
-%files doc
+%files doc -f %{name}-doc.files
 %defattr(-,root,root,-)
-%{pkg_docdir}
 %endif
 
 
@@ -143,6 +134,10 @@ fi
 
 
 %changelog
+* Mon Apr 20 2009 Jens Petersen <petersen@redhat.com> - 1.4.5-7
+- rebuild with ghc-6.10.2
+- update to latest cabal2spec template and macros.ghc
+
 * Sat Apr  4 2009 Yaakov M. Nemoy <yankee@localhost.localdomain> - 1.4.5-6
 - rebuild bump to raise EVR manually, to match with F-10 branch