Accepting request 53135 from home:dimstar:branches:GNOME:Factory

thanks

OBS-URL: https://build.opensuse.org/request/show/53135
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=128

gtk+-2.22.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d9522c80d4b8a954f7474e32bd5a99ba3051996f1c4681426db5f79a1c1b4602
-size 18146592

gtk+-2.22.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:965bc124f0d25087c4cb2a64cbfd7e4f896e05be8d560fbba68dd8685ba24d07
+size 18306164

gtk2.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Tue Nov 16 09:28:29 CET 2010 - dimstar@opensuse.org
+
+- Update to version 2.22.1:
+  + bgo#563002: Doesn't call 'update-preview' on set_filename
+  + bgo#609622: disappearing statusicon
+  + bgo#613728: Rationalize GtkTreeView focus
+  + bgo#624025: gdk_draw_rectangle bogged down by ColorSync
+  + bgo#629722: save_entry_get_info_cb() doesn't behave correctly
+  + bgo#630962: double click isn't catched
+  + bgo#631332: gdk_pixmap_create_from_data();
+  + bgo#631473: Fix GTK+3 documentation
+  + bgo#631872: Please ship modules/input/README.multipress in
+    tarballs
+  + bgo#632894: Only show Desktop in file chooser button if there
+    is one
+  + Updated translations.
+- Removed FIXME for README.multipress; the file is in the tarball.
+- Rebase gtk64.patch.
+
 -------------------------------------------------------------------
 Wed Oct 13 20:34:30 CEST 2010 - vuntz@opensuse.org
 

gtk2.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package gtk2 (Version 2.22.0)
+# spec file for package gtk2 (Version 2.22.1)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -21,12 +21,11 @@
 
 Name:           gtk2
 %define _name gtk+
-Version:        2.22.0
+Version:        2.22.1
-Release:        2
+Release:        1
 # NOTE: on upgrade to a new upstream version, change the Obsoletes from <= to < (here and in baselibs.conf)
 # FIXME: 2.19.3 doesn't compile with parallel build. Check if this is still true for later versions.
 # FIXME: when updating to next version, check whether we can remove the workaround for bgo#596977 below (removing -fomit-frame-pointer)
-# FIXME: once https://bugzilla.gnome.org/show_bug.cgi?id=631872 is fixed, distribute README.multipress
 License:        LGPLv2.1+
 Summary:        The GTK+ toolkit library (version 2)
 Url:            http://www.gtk.org/
@@ -472,8 +471,7 @@ fi
 
 %files immodule-multipress
 %defattr(-,root,root)
-# Not in tarball
+%doc modules/input/README.multipress
-#%doc modules/input/README.multipress
 %{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-multipress.so
 %config %{_sysconfdir}/gtk-2.0/im-multipress.conf
 

gtk64.patch

@@ -1,8 +1,8 @@
-Index: gtk+-2.21.4/gtk/Makefile.am
+Index: gtk+-2.22.1/gtk/Makefile.am
 ===================================================================
---- gtk+-2.21.4.orig/gtk/Makefile.am
+--- gtk+-2.22.1.orig/gtk/Makefile.am
-+++ gtk+-2.21.4/gtk/Makefile.am
++++ gtk+-2.22.1/gtk/Makefile.am
-@@ -974,7 +974,7 @@ distclean-local:
+@@ -976,7 +976,7 @@ distclean-local:
  
  DEPS = $(gtktargetlib) $(top_builddir)/gdk/$(gdktargetlib)
  
@@ -11,10 +11,10 @@ Index: gtk+-2.21.4/gtk/Makefile.am
  
  LDADDS =								\
  	$(gtktargetlib)							\
-Index: gtk+-2.21.4/gtk/gtkmodules.c
+Index: gtk+-2.22.1/gtk/gtkmodules.c
 ===================================================================
---- gtk+-2.21.4.orig/gtk/gtkmodules.c
+--- gtk+-2.22.1.orig/gtk/gtkmodules.c
-+++ gtk+-2.21.4/gtk/gtkmodules.c
++++ gtk+-2.22.1/gtk/gtkmodules.c
 @@ -68,7 +68,7 @@ get_module_path (void)
    if (home_dir)
      home_gtk_dir = g_build_filename (home_dir, ".gtk-2.0", NULL);
@@ -24,10 +24,10 @@ Index: gtk+-2.21.4/gtk/gtkmodules.c
    exe_prefix = g_getenv ("GTK_EXE_PREFIX");
  
    if (exe_prefix)
-Index: gtk+-2.21.4/gtk/gtkrc.c
+Index: gtk+-2.22.1/gtk/gtkrc.c
 ===================================================================
---- gtk+-2.21.4.orig/gtk/gtkrc.c
+--- gtk+-2.22.1.orig/gtk/gtkrc.c
-+++ gtk+-2.21.4/gtk/gtkrc.c
++++ gtk+-2.22.1/gtk/gtkrc.c
 @@ -450,7 +450,7 @@ gtk_rc_get_im_module_file (void)
        if (im_module_file)
  	result = g_strdup (im_module_file);
@@ -37,10 +37,10 @@ Index: gtk+-2.21.4/gtk/gtkrc.c
      }
  
    return result;
-Index: gtk+-2.21.4/modules/input/Makefile.am
+Index: gtk+-2.22.1/modules/input/Makefile.am
 ===================================================================
---- gtk+-2.21.4.orig/modules/input/Makefile.am
+--- gtk+-2.22.1.orig/modules/input/Makefile.am
-+++ gtk+-2.21.4/modules/input/Makefile.am
++++ gtk+-2.22.1/modules/input/Makefile.am
 @@ -189,11 +189,11 @@ install-data-hook:
  	@if $(RUN_QUERY_IMMODULES_TEST) ; then \
  	  echo $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
@@ -65,7 +65,7 @@ Index: gtk+-2.21.4/modules/input/Makefile.am
  
  if BUILD_DYNAMIC_MODULES
  
-@@ -237,14 +237,14 @@ noinst_LTLIBRARIES =				\
+@@ -237,16 +237,16 @@ noinst_LTLIBRARIES =				\
  
  included-modules: $(noinst_LTLIBRARIES)
  
@@ -74,6 +74,8 @@ Index: gtk+-2.21.4/modules/input/Makefile.am
 +gtk64.immodules: Makefile.am $(module_LTLIBRARIES)
 +	$(top_builddir)/gtk/gtk-query-immodules-2.0 $(module_LTLIBRARIES) > gtk64.immodules
  
+ EXTRA_DIST += README.multipress
+ 
 -CLEANFILES = gtk.immodules
 +CLEANFILES = gtk64.immodules