[ghc-mtl] update to cabal2spec-0.22.4

Jens Petersen petersen at fedoraproject.org
Fri Jan 14 12:13:25 UTC 2011


commit e9a0ddaf1e010d0ba0dff218cde35352b4d60f0f
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Jan 14 21:13:13 2011 +0900

    update to cabal2spec-0.22.4

 ghc-mtl.spec |   20 ++++++--------------
 1 files changed, 6 insertions(+), 14 deletions(-)
---
diff --git a/ghc-mtl.spec b/ghc-mtl.spec
index de24cd8..aaf1b83 100644
--- a/ghc-mtl.spec
+++ b/ghc-mtl.spec
@@ -6,30 +6,24 @@
 
 %global ghc_pkg_deps ghc-transformers-devel
 
-%bcond_without shared
-%bcond_without hscolour
-
 # debuginfo is not useful for ghc
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-# breaks haskell-platform-2010.2.0.0
+# haskell-platform-2011.1.0.0
 Version:        2.0.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        BSD
 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.8.1
-%if %{with hscolour}
+BuildRequires:  ghc-rpm-macros >= 0.7.3
 BuildRequires:  hscolour
-%endif
 %{?ghc_pkg_deps:BuildRequires:  %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
 
 %description
@@ -48,18 +42,16 @@ This package provides the shared library.
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %ghc_lib_install
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %ghc_lib_package
 
 
 %changelog
+* Fri Jan 14 2011 Jens Petersen <petersen at redhat.com> - 2.0.1.0-2
+- update to cabal2spec-0.22.4
+
 * Thu Nov 25 2010 Jens Petersen <petersen at redhat.com> - 2.0.1.0-1
 - update to mtl 2.0.1.0 for ghc7
 - depends on transformers


More information about the scm-commits mailing list