diff --git a/ghc-X11-xft.spec b/ghc-X11-xft.spec index af05a5f..2181ad9 100644 --- a/ghc-X11-xft.spec +++ b/ghc-X11-xft.spec @@ -5,35 +5,26 @@ %global common_description Haskell bindings to Xft, X Free Type interface library,\ and some Xrender parts. -%global ghc_pkg_deps ghc-X11-devel ghc-utf8-string-devel - %global ghc_pkg_c_deps libXft-devel -# debuginfo is not useful for ghc -%global debug_package %{nil} - Name: ghc-%{pkg_name} Version: 0.3 -Release: 15%{?dist} +Release: 16%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: LGPLv2 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")} %{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}} +BuildRequires: ghc-X11-prof, ghc-utf8-string-prof, ghc-haskell98-prof %description %{common_description} -%if %{with shared} -This package provides the shared library. -%endif %prep @@ -52,6 +43,9 @@ This package provides the shared library. %changelog +* Wed Jun 22 2011 Jens Petersen - 0.3-16 +- BR ghc-Cabal-devel instead of ghc-prof and use ghc_arches (cabal2spec-0.23.2) + * Thu Mar 10 2011 Fabio M. Di Nitto - 0.3-15 - Enable build on sparcv9