From 78e15ad2950bdde9e47463b0f8183adea55f0153 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sep 04 2010 12:32:33 +0000 Subject: ghc-rpm-macros-0.8.1: add hscolour and doc obsolete (cabal2spec-0.22.2) --- diff --git a/ghc-html.spec b/ghc-html.spec index 6fd069a..7a3b0b8 100644 --- a/ghc-html.spec +++ b/ghc-html.spec @@ -5,14 +5,15 @@ %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.1.0.0 +# part of haskell-platform-2010.2.0.0 Version: 1.0.1.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -23,7 +24,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} @@ -32,9 +36,6 @@ This package provides the shared library. %endif -%{?ghc_lib_package} - - %prep %setup -q -n %{pkg_name}-%{version} @@ -52,7 +53,13 @@ rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT +%ghc_lib_package -o 1.0.1.2-5 + + %changelog +* Sat Sep 4 2010 Jens Petersen - 1.0.1.2-5 +- add hscolour and doc obsolete (cabal2spec-0.22.2) + * Sun Jun 27 2010 Jens Petersen - 1.0.1.2-4 - sync cabal2spec-0.22.1