[ghc-xmonad-contrib] update to cabal2spec-0.23.2
Jens Petersen
petersen at fedoraproject.org
Wed Jun 22 05:39:42 UTC 2011
commit 018e9d781998c154f3a607103b5beb542905edd4
Author: Jens Petersen <petersen at redhat.com>
Date: Wed Jun 22 14:39:30 2011 +0900
update to cabal2spec-0.23.2
.chain-deps | 6 +-----
ghc-xmonad-contrib.spec | 22 ++++++++--------------
2 files changed, 9 insertions(+), 19 deletions(-)
---
diff --git a/.chain-deps b/.chain-deps
index 0271ed3..1637855 100644
--- a/.chain-deps
+++ b/.chain-deps
@@ -1,5 +1 @@
-# rebuild.sh config file: see <http://git.fedorahosted.org/git/haskell-sig.git>
-
-echo "Prerequisites: utf8-string"
-
-CHAIN_PKGS="ghc-X11 : xmonad ghc-X11-xft"
+ghc-X11 : xmonad ghc-X11-xft :
diff --git a/ghc-xmonad-contrib.spec b/ghc-xmonad-contrib.spec
index d955d9f..84716f1 100644
--- a/ghc-xmonad-contrib.spec
+++ b/ghc-xmonad-contrib.spec
@@ -13,32 +13,23 @@ extensions, see "XMonad.Doc". In particular:\
"XMonad.Doc.Developing", introduction to xmonad internals and writing\
your own extensions.
-%global ghc_pkg_deps ghc-X11-xft-devel, ghc-utf8-string-devel, ghc-xmonad-devel
-
-# debuginfo is not useful for ghc
-%global debug_package %{nil}
-
Name: ghc-%{pkg_name}
Version: 0.9.2
-Release: 3%{?dist}
+Release: 4%{?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
-# fedora ghc archs:
-ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9
-BuildRequires: ghc, ghc-doc, ghc-prof
-BuildRequires: ghc-rpm-macros >= 0.7.3
+ExclusiveArch: %{ghc_arches}
+BuildRequires: ghc-Cabal-devel
+BuildRequires: ghc-rpm-macros
BuildRequires: hscolour
-%{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
+BuildRequires: ghc-X11-xft-prof, ghc-utf8-string-prof, ghc-xmonad-prof
%description
%{common_description}
-%if %{with shared}
-This package provides the shared library.
-%endif
%prep
@@ -57,6 +48,9 @@ This package provides the shared library.
%changelog
+* Wed Jun 22 2011 Jens Petersen <petersen at redhat.com> - 0.9.2-4
+- BR ghc-Cabal-devel instead of ghc-prof and use ghc_arches (cabal2spec-0.23.2)
+
* Thu Mar 10 2011 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.9.2-3
- Enable build on sparcv9
More information about the scm-commits
mailing list