[ghc-editline] ghc-rpm-macros-0.8.1: add hscolour and doc obsolete (cabal2spec-0.22.2)

Jens Petersen petersen at fedoraproject.org
Sat Sep 4 11:48:27 UTC 2010


commit 1be3f26cc2a4256ca18b95d6408150e4465fd75e
Author: Jens Petersen <petersen at redhat.com>
Date:   Sat Sep 4 21:48:24 2010 +1000

    ghc-rpm-macros-0.8.1: add hscolour and doc obsolete (cabal2spec-0.22.2)

 ghc-editline.spec |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/ghc-editline.spec b/ghc-editline.spec
index 649ff25..90beb5a 100644
--- a/ghc-editline.spec
+++ b/ghc-editline.spec
@@ -12,6 +12,7 @@ provides a subset of the functionality of the readline library.
 %global ghc_pkg_c_deps libedit-devel
 
 %bcond_without shared
+%bcond_without hscolour
 
 # debuginfo is not useful for ghc
 %global debug_package %{nil}
@@ -19,7 +20,7 @@ provides a subset of the functionality of the readline library.
 Name:           ghc-%{pkg_name}
 # was part of haskell-platform-2009.2.0.2
 Version:        0.2.1.0
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -30,7 +31,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
@@ -40,9 +44,6 @@ This package provides the shared library.
 %endif
 
 
-%{?ghc_lib_package}
-
-
 %prep
 %setup -q -n %{pkg_name}-%{version}
 
@@ -60,7 +61,13 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
+%ghc_lib_package -o 0.2.1.0-17
+
+
 %Changelog
+* Sat Sep  4 2010 Jens Petersen <petersen at redhat.com> - 0.2.1.0-17
+- add hscolour and doc obsolete (cabal2spec-0.22.2)
+
 * Sun Jun 27 2010 Jens Petersen <petersen at redhat.com> - 0.2.1.0-16
 - sync cabal2spec-0.22.1
 


More information about the scm-commits mailing list