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

Jens Petersen petersen at fedoraproject.org
Sat Sep 4 12:26:55 UTC 2010


commit 34996a5b3c7a345502b5f8ef82ff669cf6ed6c1c
Author: Jens Petersen <petersen at redhat.com>
Date:   Sat Sep 4 22:26:54 2010 +1000

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

 ghc-haskell-src.spec |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/ghc-haskell-src.spec b/ghc-haskell-src.spec
index 506fd3b..299bb00 100644
--- a/ghc-haskell-src.spec
+++ b/ghc-haskell-src.spec
@@ -6,14 +6,15 @@
 an abstract syntax, lexer, parser and pretty-printer.
 
 %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.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -24,7 +25,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
 BuildRequires:  happy
 
 %description
@@ -34,9 +38,6 @@ This package provides the shared library.
 %endif
 
 
-%{?ghc_lib_package}
-
-
 %prep
 %setup -q -n %{pkg_name}-%{version}
 
@@ -54,7 +55,13 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
+%ghc_lib_package -o 1.0.1.3-6
+
+
 %changelog
+* Sat Sep  4 2010 Jens Petersen <petersen at redhat.com> - 1.0.1.3-6
+- add hscolour and doc obsolete (cabal2spec-0.22.2)
+
 * Sun Jun 27 2010 Jens Petersen <petersen at redhat.com> - 1.0.1.3-5
 - sync cabal2spec-0.22.1
 


More information about the scm-commits mailing list