[ghc-fgl] update to cabal2spec-0.22.4

Jens Petersen petersen at fedoraproject.org
Tue Jan 18 08:36:30 UTC 2011


commit 3ee29510328a52710db52b2266ec6b64bd0edb3c
Author: Jens Petersen <petersen at redhat.com>
Date:   Tue Jan 18 18:36:19 2011 +1000

    update to cabal2spec-0.22.4

 ghc-fgl.spec |   18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)
---
diff --git a/ghc-fgl.spec b/ghc-fgl.spec
index e7c4840..76f5391 100644
--- a/ghc-fgl.spec
+++ b/ghc-fgl.spec
@@ -6,30 +6,24 @@
 
 %global ghc_pkg_deps ghc-mtl-devel
 
-%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.2.0.0
 Version:        5.4.2.3
-Release:        2%{?dist}
+Release:        3%{?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
+* Tue Jan 18 2011 Jens Petersen <petersen at redhat.com> - 5.4.2.3-3
+- update to cabal2spec-0.22.4
+
 * Thu Nov 25 2010 Jens Petersen <petersen at redhat.com> - 5.4.2.3-2
 - add hscolour
 - drop -o obsoletes


More information about the scm-commits mailing list