diff --git a/.gitignore b/.gitignore index f2d09df..1998d2a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /glib-0.11.1.tar.gz /glib-0.11.2.tar.gz +/glib-0.12.0.tar.gz diff --git a/ghc-glib-Gtk2HsSetup-Cabal-1.10.patch b/ghc-glib-Gtk2HsSetup-Cabal-1.10.patch deleted file mode 100644 index 6ac51db..0000000 --- a/ghc-glib-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/ghc-glib.spec b/ghc-glib.spec index 6c00275..86947e6 100644 --- a/ghc-glib.spec +++ b/ghc-glib.spec @@ -10,8 +10,8 @@ %global ghc_pkg_obsoletes ghc-gconf-devel < 0.11, ghc-gstreamer-devel < 0.11, ghc-svgcairo-devel < 0.11, ghc-gtk2hs-doc < 0.11 Name: ghc-%{pkg_name} -Version: 0.11.2 -Release: 4%{?dist} +Version: 0.12.0 +Release: 1%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -27,7 +27,6 @@ BuildRequires: ghc-rpm-macros >= 0.8.2 BuildRequires: hscolour %{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}} BuildRequires: gtk2hs-buildtools -Patch1: ghc-glib-Gtk2HsSetup-Cabal-1.10.patch %description %{common_description} @@ -40,7 +39,6 @@ This package provides the shared library. %prep %setup -q -n %{pkg_name}-%{version} -%patch1 -p1 -b .orig %build @@ -57,6 +55,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Nov 30 2010 Jens Petersen - 0.12.0-1 +- update to 0.12.0 and drop the Gtk2HsSetup patch + * Thu Nov 25 2010 Jens Petersen - 0.11.2-4 - obsolete ghc-gtk2hs-doc - fix build with Cabal-1.10 with ghc-glib-Gtk2HsSetup-Cabal-1.10.patch diff --git a/sources b/sources index ea15e30..bb14ff5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -79e303cae2f7c590674c1c56ca5d07e1 glib-0.11.2.tar.gz +2f334374d14a2f3e221a2ebfce1f8817 glib-0.12.0.tar.gz