From e36752df6094bc0f2dc6a639616a481fd4fd6a9c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sep 04 2010 11:40:37 +0000 Subject: ghc-rpm-macros-0.8.1: add hscolour and doc obsolete (cabal2spec-0.22.2) --- diff --git a/ghc-chalmers-lava2000.spec b/ghc-chalmers-lava2000.spec index c352096..b0477b8 100644 --- a/ghc-chalmers-lava2000.spec +++ b/ghc-chalmers-lava2000.spec @@ -5,13 +5,14 @@ %global common_description A Hardware description library for Haskell. %bcond_without shared +%bcond_without hscolour # debuginfo is not useful for ghc %global debug_package %{nil} Name: ghc-%{pkg_name} Version: 1.1.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -26,7 +27,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} @@ -35,9 +39,6 @@ This package provides the shared library. %endif -%{?ghc_lib_package} - - %prep %setup -q -n %{pkg_name}-%{version} %patch0 -p1 -b .orig @@ -64,7 +65,13 @@ echo "%doc tutorial.ps.gz" >> %{name}-doc.files rm -rf %{buildroot} +%ghc_lib_package -o 1.1.1-7 + + %changelog +* Sat Sep 4 2010 Jens Petersen - 1.1.1-7 +- add hscolour and doc obsolete (cabal2spec-0.22.2) + * Tue Jun 29 2010 Jens Petersen - 1.1.1-6 - update to cabal2spec-0.22.1