Update to 2.24.15

Drop the automake 1.13 and gmodule linking patches; fixed upstream.

.gitignore

@@ -17,3 +17,4 @@ gtk+-2.21.5.tar.bz2
 /gtk+-2.24.11.tar.bz2
 /gtk+-2.24.13.tar.xz
 /gtk+-2.24.14.tar.xz
+/gtk+-2.24.15.tar.xz

gtk-automak.patch

@@ -1,27 +0,0 @@
-diff -up gtk+-2.24.14/configure.in.automak gtk+-2.24.14/configure.in
---- gtk+-2.24.14/configure.in.automak	2013-01-15 18:29:09.834915289 -0500
-+++ gtk+-2.24.14/configure.in	2013-01-15 18:30:19.857912786 -0500
-@@ -44,14 +44,13 @@ AC_INIT([gtk+], [gtk_version],
- 	[gtk+])
- 
- AC_CONFIG_SRCDIR([gdk/gdktypes.h])
--
-+AC_CONFIG_HEADERS(config.h)
- AC_CONFIG_MACRO_DIR([m4])
- 
- # Save this value here, since automake will set cflags later
- cflags_set=${CFLAGS+set}
- 
- AM_INIT_AUTOMAKE([no-define -Wno-portability dist-bzip2])
--AM_CONFIG_HEADER(config.h)
- 
- # Support silent build rules, requires at least automake-1.11. Enable
- # by either passing --enable-silent-rules to configure or passing V=0
-@@ -300,7 +299,6 @@ AM_SANITY_CHECK
- 
- # Checks for programs.
- AC_ISC_POSIX
--AM_PROG_CC_STDC
- AM_PROG_CC_C_O
- AC_PROG_INSTALL
- AC_PROG_MAKE_SET

gtk2-fixdso.patch

@@ -1,15 +0,0 @@
---- gtk+-2.24.8/gtk/Makefile.am.orig	2012-02-01 11:14:25.468115547 +0000
-+++ gtk+-2.24.8/gtk/Makefile.am	2012-02-01 11:14:57.920116650 +0000
-@@ -904,10 +904,10 @@
- libgtk_quartz_2_0_la_SOURCES = $(gtk_c_sources)
- libgtk_directfb_2_0_la_SOURCES = $(gtk_c_sources)
- 
--libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts)
-+libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts) -lgmodule-2.0
- libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
- libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts)
--libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts)
-+libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts) -lgmodule-2.0
- 
- libgtk_x11_2_0_la_LIBADD = $(libadd)
- libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32

gtk2.spec

@@ -17,7 +17,7 @@
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
-Version: 2.24.14
+Version: 2.24.15
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -38,10 +38,6 @@ Patch8: tooltip-positioning.patch
 #Patch14: gtk2-landscape-pdf-print.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=611313
 Patch15: window-dragging.patch
-# fix dso.
-Patch17: gtk2-fixdso.patch
-# automake 1.13 :-(
-Patch18: gtk-automak.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -157,11 +153,6 @@ This package contains developer documentation for the GTK+ widget toolkit.
 %patch8 -p1 -b .tooltip-positioning
 #%patch14 -p1 -b .landscape-pdf-print
 %patch15 -p1 -b .window-dragging
-%patch17 -p1 -b .fixdso
-%patch18 -p1 -b .automak
-
-libtoolize
-autoreconf -i -f
 
 %build
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
@@ -348,6 +339,10 @@ fi
 %doc tmpdocs/examples
 
 %changelog
+* Sun Feb 10 2013 Kalev Lember <kalevlember@gmail.com> - 2.24.15-1
+- Update to 2.24.15
+- Drop the automake 1.13 and gmodule linking patches; fixed upstream
+
 * Tue Jan 15 2013 Matthias Clasen <mclasen@redhat.com> - 2.24.14-1
 - Update to 2.24.14
 

sources

@@ -1 +1 @@
-e2c16f119ed624893ecfc3775930ae4c  gtk+-2.24.14.tar.xz
+68f034fb4f68086790d7488cf00e71c8  gtk+-2.24.15.tar.xz