- updated to 2.24.31 (fixes CVE-2013-7447)

- removed obsolete gobject-introspection patch

diff --git a/gobject-introspection.patch b/gobject-introspection.patch
deleted file mode 100644 (file)
index 9fd72ef..0000000
--- a/gobject-introspection.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN gtk+-2.22.0/gdk/Makefile.am gtk+-2.22.0.new//gdk/Makefile.am
---- gtk+-2.22.0/gdk/Makefile.am        2010-09-23 05:00:45.000000000 +0200
-+++ gtk+-2.22.0.new//gdk/Makefile.am   2010-09-27 20:45:46.955178923 +0200
-@@ -238,7 +238,7 @@
-         x11/gdkx.h
- 
- GdkX11-2.0.gir: $(gdktargetlib) Gdk-2.0.gir Makefile
--GdkX11_2_0_gir_SCANNERFLAGS = --warn-all --strip-prefix=Gdk
-+GdkX11_2_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=Gdk --symbol-prefix=gdk
- GdkX11_2_0_gir_INCLUDES = Gio-2.0 Gdk-2.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
- GdkX11_2_0_gir_LIBS = $(gdktargetlib)
- GdkX11_2_0_gir_FILES = $(x11_introspection_files)

diff --git a/gtk+2.spec b/gtk+2.spec
index 423e67e4be8cb63e7e8e650d43b2465c766ccbd0..aca73ea955cdd12569615ba1e653eace055c32d1 100644 (file)
--- a/gtk+2.spec
+++ b/gtk+2.spec
@@ -14,16 +14,15 @@ Summary(it.UTF-8):  Il toolkit per GIMP
 Summary(pl.UTF-8):     GIMP Toolkit
 Summary(tr.UTF-8):     GIMP ToolKit arayüz kitaplığı
 Name:          gtk+2
-Version:       2.24.30
+Version:       2.24.31
 Release:       1
 Epoch:         2
 License:       LGPL v2+
 Group:         X11/Libraries
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.24/gtk+-%{version}.tar.xz
-# Source0-md5: 04568ba5c58b75e3c7543e45628ad789
+# Source0-md5: 526a1008586094a2cbb4592fd3f9ee10
 Patch0:                %{name}-arch_confdir.patch
-Patch1:                gobject-introspection.patch
-Patch2:                %{name}-papi.patch
+Patch1:                %{name}-papi.patch
 URL:           http://www.gtk.org/
 BuildRequires: atk-devel >= 1:1.30.0-3
 BuildRequires: autoconf >= 2.62
@@ -251,7 +250,6 @@ Moduł GTK+ do drukowania przez PAPI.
 %setup -q -n gtk+-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python,/usr/bin/python,' gtk/gtk-builder-convert