[ghc-parsec] update to ghc-rpm-macros-0.8.1, hscolour and drop doc pkg (cabal2spec-0.22.2)

Jens Petersen petersen at fedoraproject.org
Sat Sep 4 07:43:51 UTC 2010


commit 8d1e7e8050196383cccbdc74197cf5f5b7d7db44
Author: Jens Petersen <petersen at redhat.com>
Date:   Sat Sep 4 17:43:51 2010 +1000

    update to ghc-rpm-macros-0.8.1, hscolour and drop doc pkg (cabal2spec-0.22.2)

 ghc-parsec.spec |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)
---
diff --git a/ghc-parsec.spec b/ghc-parsec.spec
index 25fc3f3..dbc1044 100644
--- a/ghc-parsec.spec
+++ b/ghc-parsec.spec
@@ -9,14 +9,15 @@ that can be stacked on arbitrary monads, and it is also parametric\
 in the input stream type.
 
 %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:        2.1.0.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
@@ -27,7 +28,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.6.0
+BuildRequires:  ghc-rpm-macros >= 0.8.1
+%if %{with hscolour}
+BuildRequires:  hscolour
+%endif
 
 %description
 %{common_description}
@@ -36,33 +40,31 @@ This package provides the shared library.
 %endif
 
 
-%{?ghc_lib_package}
-
-
 %prep
 %setup -q -n %{pkg_name}-%{version}
 
 
 %build
-%cabal_configure --ghc -p
-%cabal build
-%cabal haddock
+%ghc_lib_build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%cabal_install
-%cabal_pkg_conf
-
-%ghc_gen_filelists
-%ghc_strip_dynlinked
+%ghc_lib_install
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%ghc_lib_package -o 2.1.0.1-5
+
+
 %changelog
+* Sat Sep  4 2010 Jens Petersen <petersen at redhat.com> - 2.1.0.1-5
+- update to ghc-rpm-macros-0.8.1, hscolour and drop doc pkg (cabal2spec-0.22.2)
+- part of haskell-platform-2010.2.0.0
+
 * Wed Jun 23 2010 Jens Petersen <petersen at redhat.com> - 2.1.0.1-4
 - use ghc_strip_dynlinked (ghc-rpm-macros-0.6.0)
 


More information about the scm-commits mailing list