From 8902f238017de1b03f32242ca5f87073b3bf2bbd Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 31 Jul 2010 22:24:09 +1000 Subject: [PATCH] - ghc-rpm-macros-0.8.1 for doc obsoletes - part of haskell-platform-2010.2.0.0 - add hscolour --- ghc-HTTP.spec | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/ghc-HTTP.spec b/ghc-HTTP.spec index f577cfa..a398f72 100644 --- a/ghc-HTTP.spec +++ b/ghc-HTTP.spec @@ -7,14 +7,15 @@ %global ghc_pkg_deps ghc-network-devel ghc-mtl-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: 4000.0.9 -Release: 4%{?dist} +Release: 5%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -25,7 +26,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_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} %description @@ -35,9 +39,6 @@ This package provides the shared library. %endif -%{?ghc_lib_package} - - %prep %setup -q -n %{pkg_name}-%{version} @@ -55,7 +56,15 @@ rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT +%ghc_lib_package -o 4000.0.9-5 + + %changelog +* Sat Jul 31 2010 Jens Petersen - 4000.0.9-5 +- ghc-rpm-macros-0.8.1 for doc obsoletes +- part of haskell-platform-2010.2.0.0 +- add hscolour + * Sat Jun 26 2010 Jens Petersen - 4000.0.9-4 - sync cabal2spec-0.22