[ghc-haskeline] update to cabal2spec-0.22.4

Jens Petersen petersen at fedoraproject.org
Wed Jan 19 03:15:27 UTC 2011


commit 12726073fd0269dcef5a2c17a874848697b05eac
Author: Jens Petersen <petersen at redhat.com>
Date:   Wed Jan 19 13:15:17 2011 +1000

    update to cabal2spec-0.22.4

 ghc-haskeline.spec |   18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)
---
diff --git a/ghc-haskeline.spec b/ghc-haskeline.spec
index 532876c..1afdfa9 100644
--- a/ghc-haskeline.spec
+++ b/ghc-haskeline.spec
@@ -10,29 +10,23 @@ Haskeline runs both on POSIX-compatible systems and on Windows.
 
 %global ghc_pkg_deps ghc-mtl-devel ghc-utf8-string-devel, ghc-terminfo-devel
 
-%bcond_without shared
-%bcond_without hscolour
- 
 # debuginfo is not useful for ghc
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
 Version:        0.6.3.2
-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
@@ -54,15 +48,13 @@ This package provides the shared library.
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %ghc_lib_install
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %changelog
+* Wed Jan 19 2011 Jens Petersen <petersen at redhat.com> - 0.6.3.2-3
+- update to cabal2spec-0.22.4
+
 * Thu Nov 25 2010 Jens Petersen <petersen at redhat.com> - 0.6.3.2-2
 - update url
 


More information about the scm-commits mailing list