From 39629d603c31e5c1b54cca0c0daba519ba6df34a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Nov 25 2010 09:35:24 +0000 Subject: fix Cabal-1.10 build --- diff --git a/ghc-gtk.spec b/ghc-gtk.spec index 322649d..df1c1c7 100644 --- a/ghc-gtk.spec +++ b/ghc-gtk.spec @@ -20,7 +20,7 @@ Name: ghc-%{pkg_name} Version: 0.11.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -38,6 +38,7 @@ 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: gtk2hs-buildtools +Patch1: ghc7-Gtk2HsSetup-Cabal-1.10.patch %description %{common_description} @@ -51,6 +52,7 @@ This package provides the shared library. %prep %setup -q -n %{pkg_name}-%{version} +%patch1 -p1 -b .orig %build @@ -71,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Nov 25 2010 Jens Petersen - 0.11.2-6 +- fix Cabal-1.10 build with ghc7-Gtk2HsSetup-Cabal-1.10.patch + * Thu Oct 28 2010 Jens Petersen - 0.11.2-5 - glade and gtksourceview2 packages are now in fedora - add explicit dep on mtl