diff --git a/ghc-html.spec b/ghc-html.spec
index f7ffc87..dcdfb21 100644
--- a/ghc-html.spec
+++ b/ghc-html.spec
@@ -4,30 +4,24 @@
%global common_description A HTML combinator library for Haskell.
-%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.2.0.0
Version: 1.0.1.2
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: %{common_summary}
Group: System Environment/Libraries
License: BSD
URL: http://hackage.haskell.org/package/%{pkg_name}
Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
-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.8.1
-%if %{with hscolour}
+BuildRequires: ghc-rpm-macros >= 0.7.3
BuildRequires: hscolour
-%endif
%description
%{common_description}
@@ -45,18 +39,16 @@ This package provides the shared library.
%install
-rm -rf $RPM_BUILD_ROOT
%ghc_lib_install
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%ghc_lib_package
%changelog
+* Tue Jan 18 2011 Jens Petersen - 1.0.1.2-7
+- update to cabal2spec-0.22.4
+
* Thu Nov 25 2010 Jens Petersen - 1.0.1.2-6
- update url