[ghc-deepseq] - ghc-rpm-macros-0.8.1 for doc obsoletes - part of haskell-platform-2010.2.0.0 - add hscolour - simp

Jens Petersen petersen at fedoraproject.org
Sat Jul 31 14:49:30 UTC 2010


commit 06959c764358679fef2a7ee10e2304d0c9e72c4d
Author: Jens Petersen <petersen at redhat.com>
Date:   Sun Aug 1 00:48:07 2010 +1000

    - ghc-rpm-macros-0.8.1 for doc obsoletes
    - part of haskell-platform-2010.2.0.0
    - add hscolour
    - simplify url

 ghc-deepseq.spec |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)
---
diff --git a/ghc-deepseq.spec b/ghc-deepseq.spec
index 0cafb94..985d1af 100644
--- a/ghc-deepseq.spec
+++ b/ghc-deepseq.spec
@@ -5,25 +5,29 @@
 %global common_description Library provides a "deep" version of seq, for fully evaluating data structures.
 
 %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.1.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        BSD
-URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
+URL:            http://hackage.haskell.org/package/%{pkg_name}
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
 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,16 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
+%ghc_lib_package -o 1.1.0.0-4
+
+
 %changelog
+* Sun Aug  1 2010 Jens Petersen <petersen at redhat.com> - 1.1.0.0-4
+- ghc-rpm-macros-0.8.1 for doc obsoletes
+- part of haskell-platform-2010.2.0.0
+- add hscolour
+- simplify url
+
 * Sat Jun 26 2010 Jens Petersen <petersen at redhat.com> - 1.1.0.0-3
 - sync cabal2spec-0.22
 


More information about the scm-commits mailing list