From 26a4a03ebbc6bb3d36904c2a22f37bbfebf5b66a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Nov 30 2010 04:29:05 +0000 Subject: update to 0.12.0 --- diff --git a/.gitignore b/.gitignore index ad499d2..402a449 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /gtk-0.11.2.tar.gz +/gtk-0.12.0.tar.gz diff --git a/ghc-gtk.spec b/ghc-gtk.spec index a46919d..1ede312 100644 --- a/ghc-gtk.spec +++ b/ghc-gtk.spec @@ -18,8 +18,8 @@ %global debug_package %{nil} Name: ghc-%{pkg_name} -Version: 0.11.2 -Release: 6%{?dist} +Version: 0.12.0 +Release: 1%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -37,7 +37,6 @@ 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,7 +50,6 @@ This package provides the shared library. %prep %setup -q -n %{pkg_name}-%{version} -%patch1 -p1 -b .orig %build @@ -72,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Nov 30 2010 Jens Petersen - 0.12.0-1 +- update to 0.12.0 + * Thu Nov 25 2010 Jens Petersen - 0.11.2-6 - fix Cabal-1.10 build with ghc7-Gtk2HsSetup-Cabal-1.10.patch - drop devhelp since no longer supported by haddock-2.8.0 diff --git a/ghc7-Gtk2HsSetup-Cabal-1.10.patch b/ghc7-Gtk2HsSetup-Cabal-1.10.patch deleted file mode 100644 index 6ac51db..0000000 --- a/ghc7-Gtk2HsSetup-Cabal-1.10.patch +++ /dev/null @@ -1,12 +0,0 @@ -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)) diff --git a/sources b/sources index 3dc2741..fbd2388 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ede94895ef679f1c6102c7eee5f021a1 gtk-0.11.2.tar.gz +17a9d34085b703510d8feb2608b5d776 gtk-0.12.0.tar.gz