[ghc-mtl] update to latest macros, hscolour and drop doc pkg (cabal2spec-0.22.2)
Jens Petersen
petersen at fedoraproject.org
Sat Sep 4 07:12:13 UTC 2010
commit 4ff19ef8e4cd7767517be8b7c8e59c3798d08d73
Author: Jens Petersen <petersen at redhat.com>
Date: Sat Sep 4 17:12:12 2010 +1000
update to latest macros, hscolour and drop doc pkg (cabal2spec-0.22.2)
ghc-mtl.spec | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 deletions(-)
---
diff --git a/ghc-mtl.spec b/ghc-mtl.spec
index a63cf09..d56bb87 100644
--- a/ghc-mtl.spec
+++ b/ghc-mtl.spec
@@ -5,14 +5,15 @@
%global common_description A monad transformer library for Haskell: part of haskell-platform.
%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.2
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: %{common_summary}
Group: System Environment/Libraries
@@ -23,15 +24,16 @@ 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}
-
+%if %{with shared}
This package provides the shared library.
-
-
-%{?ghc_lib_package}
+%endif
%prep
@@ -39,25 +41,26 @@ This package provides the shared library.
%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 1.1.0.2-8
+
+
%changelog
+* Sat Sep 4 2010 Jens Petersen <petersen at redhat.com> - 1.1.0.2-8
+- update to latest macros, 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> - 1.1.0.2-7
- use ghc_strip_dynlinked (ghc-rpm-macros-0.6.0)
More information about the scm-commits
mailing list