[ghc-QuickCheck] update to 2.4.1.1 for haskell-platform-2011.4.0.0

Jens Petersen petersen at fedoraproject.org
Tue Dec 27 12:43:22 UTC 2011


commit 5046fe33bc08d504d95cc053a413b5c1f1ab736c
Author: Jens Petersen <petersen at redhat.com>
Date:   Tue Dec 27 21:43:15 2011 +0900

    update to 2.4.1.1 for haskell-platform-2011.4.0.0
    
    - no longer depends on mtl nor ghci
    - update to cabal2spec-0.24.1
    - build on archs without ghci without template-haskell

 .gitignore          |    1 +
 ghc-QuickCheck.spec |   33 ++++++++++++++++++++++-----------
 sources             |    2 +-
 3 files changed, 24 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 009b114..840d6f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 QuickCheck-2.1.1.1.tar.gz
 /QuickCheck-2.4.0.1.tar.gz
+/QuickCheck-2.4.1.1.tar.gz
diff --git a/ghc-QuickCheck.spec b/ghc-QuickCheck.spec
index d78120d..753543c 100644
--- a/ghc-QuickCheck.spec
+++ b/ghc-QuickCheck.spec
@@ -12,25 +12,27 @@ Specifications are expressed in Haskell, using combinators defined in\
 the QuickCheck library. QuickCheck provides combinators to define properties,\
 observe the distribution of test data, and define test data generators.
 
-# Haskell library dependencies:
-%global ghc_pkg_deps ghc-ghc-devel, ghc-mtl-devel
-
 Name:           ghc-%{pkg_name}
-# part of haskell-platform-2011.2.0.1
-Version:        2.4.0.1
-Release:        7%{?dist}.3
+# part of haskell-platform-2011.4.0.0
+Version:        2.4.1.1
+Release:        1%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        BSD
+# BEGIN cabal2spec
 URL:            http://hackage.haskell.org/package/%{pkg_name}
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
-# no ghci on ppc64
-ExcludeArch:    %{ghc_excluded_archs} ppc64
+ExclusiveArch:  %{ghc_arches}
 BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros
-BuildRequires:  hscolour
-BuildRequires:  ghc-mtl-prof, ghc-extensible-exceptions-prof, ghc-random-prof, ghc-template-haskell-prof
+BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
+# END cabal2spec
+BuildRequires:  ghc-extensible-exceptions-prof
+BuildRequires:  ghc-random-prof
+# no ghci on ppc64
+%ifarch %{ghc_arches_with_ghci}
+BuildRequires:  ghc-template-haskell-prof
+%endif
 
 %description
 %{common_description}
@@ -41,6 +43,9 @@ BuildRequires:  ghc-mtl-prof, ghc-extensible-exceptions-prof, ghc-random-prof, g
 
 
 %build
+%ifnarch %{ghc_arches_with_ghci}
+%define cabal_configure_options -f "-templateHaskell"
+%endif
 %ghc_lib_build
 
 
@@ -52,6 +57,12 @@ BuildRequires:  ghc-mtl-prof, ghc-extensible-exceptions-prof, ghc-random-prof, g
 
 
 %changelog
+* Tue Dec 27 2011 Jens Petersen <petersen at redhat.com> - 2.4.1.1-1
+- update to 2.4.1.1 for haskell-platform-2011.4.0.0
+- no longer depends on mtl nor ghci
+- update to cabal2spec-0.24.1
+- build on archs without ghci without template-haskell
+
 * Mon Oct 24 2011 Marcela Mašláňová <mmaslano at redhat.com> - 2.4.0.1-7.3
 - rebuild with new gmp without compat lib
 
diff --git a/sources b/sources
index c92228a..7e813e1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e8c86e95fd1fa4c58fc8e53e2853db5e  QuickCheck-2.4.0.1.tar.gz
+038c13d7d72942836ab4b13b61ac7c53  QuickCheck-2.4.1.1.tar.gz


More information about the scm-commits mailing list