obsolete ghc-gtk2hs-doc and fix build with Cabal-1.10

This commit is contained in:
Jens Petersen 2010-11-25 17:59:45 +10:00
parent aa6f28219b
commit 4916ea7fbe
2 changed files with 17 additions and 2 deletions

View File

@ -0,0 +1,12 @@
diff -u cairo-0.11.1/Gtk2HsSetup.hs\~ cairo-0.11.1/Gtk2HsSetup.hs
--- cairo-0.11.1/Gtk2HsSetup.hs~ 2010-11-25 17:16:11.000000000 +1000
+++ cairo-0.11.1/Gtk2HsSetup.hs 2010-11-25 17:32:40.000000000 +1000
@@ -187,7 +187,7 @@
_ | modeGenerateRegFile -> die "Generate Reg File not supported"
| modeGenerateRegScript -> die "Generate Reg Script not supported"
| otherwise -> registerPackage verbosity
- installedPkgInfo pkg lbi inplace packageDb
+ installedPkgInfo pkg lbi inplace [packageDb]
where
modeGenerateRegFile = isJust (flagToMaybe (regGenPkgConf regFlags))

View File

@ -11,7 +11,7 @@
Name: ghc-%{pkg_name} Name: ghc-%{pkg_name}
Version: 0.11.2 Version: 0.11.2
Release: 3%{?dist} Release: 4%{?dist}
Summary: %{common_summary} Summary: %{common_summary}
Group: System Environment/Libraries Group: System Environment/Libraries
@ -27,6 +27,7 @@ BuildRequires: ghc-rpm-macros >= 0.8.2
BuildRequires: hscolour BuildRequires: hscolour
%{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}} %{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}}
BuildRequires: gtk2hs-buildtools BuildRequires: gtk2hs-buildtools
Patch1: ghc-glib-Gtk2HsSetup-Cabal-1.10.patch
%description %description
%{common_description} %{common_description}
@ -39,6 +40,7 @@ This package provides the shared library.
%prep %prep
%setup -q -n %{pkg_name}-%{version} %setup -q -n %{pkg_name}-%{version}
%patch1 -p1 -b .orig
%build %build
@ -55,8 +57,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Tue Nov 23 2010 Jens Petersen <petersen@redhat.com> * Thu Nov 25 2010 Jens Petersen <petersen@redhat.com> - 0.11.2-4
- obsolete ghc-gtk2hs-doc - obsolete ghc-gtk2hs-doc
- fix build with Cabal-1.10 with ghc-glib-Gtk2HsSetup-Cabal-1.10.patch
* Sat Sep 25 2010 Jens Petersen <petersen@redhat.com> - 0.11.2-3 * Sat Sep 25 2010 Jens Petersen <petersen@redhat.com> - 0.11.2-3
- obsolete ghc-gtk2hs gconf, gstreamer, and svgcairo - obsolete ghc-gtk2hs gconf, gstreamer, and svgcairo