diff --git a/ghc-zlib.spec b/ghc-zlib.spec index aacb9a4..9ae1310 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -14,14 +14,15 @@ full zlib feature set. %global ghc_pkg_c_deps zlib-devel %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: 0.5.2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -32,7 +33,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 %{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}} %description @@ -42,9 +46,6 @@ This package provides the shared library. %endif -%{?ghc_lib_package} - - %prep %setup -q -n %{pkg_name}-%{version} @@ -62,7 +63,14 @@ rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT +%ghc_lib_package -o 0.5.2.0-4 + + %changelog +* Sat Sep 4 2010 Jens Petersen - 0.5.2.0-4 +- add hscolour and doc obsolete (cabal2spec-0.22.2) +- part of haskell-platform-2010.2.0.0 + * Sat Jun 26 2010 Jens Petersen - 0.5.2.0-3 - sync cabal2spec-0.22