rpms/metacity/devel metacity-2.20.1-dont-move-windows.patch, 1.1, 1.2 metacity.spec, 1.143, 1.144 skip-taskbar-tab.patch, 1.1, 1.2

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/metacity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31391

Modified Files:
	metacity-2.20.1-dont-move-windows.patch metacity.spec 
	skip-taskbar-tab.patch 
Log Message:
drop upstreamed patch


metacity-2.20.1-dont-move-windows.patch:

Index: metacity-2.20.1-dont-move-windows.patch
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/metacity-2.20.1-dont-move-windows.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metacity-2.20.1-dont-move-windows.patch	20 Dec 2007 17:23:18 -0000	1.1
+++ metacity-2.20.1-dont-move-windows.patch	6 Feb 2008 06:40:07 -0000	1.2
@@ -1,5 +1,5 @@
---- metacity-2.20.1/src/window.c	2007-11-17 15:11:01.000000000 -0500
-+++ metacity-2.20.1.patched/src/window.c	2007-11-28 11:43:28.000000000 -0500
+--- metacity-2.20.1/src/core/window.c	2007-11-17 15:11:01.000000000 -0500
++++ metacity-2.20.1.patched/src/core/window.c	2007-11-28 11:43:28.000000000 -0500
 @@ -74,6 +74,9 @@
  static void     meta_window_show          (MetaWindow     *window);
  static void     meta_window_hide          (MetaWindow     *window);


Index: metacity.spec
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/metacity.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- metacity.spec	6 Feb 2008 06:16:14 -0000	1.143
+++ metacity.spec	6 Feb 2008 06:40:07 -0000	1.144
@@ -11,8 +11,6 @@
 URL: http://download.gnome.org/sources/metacity/
 Source0: http://download.gnome.org/sources/metacity/2.21/%{metacity_filename}.tar.bz2
 Patch0: default-theme.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=482354
-Patch1: metacity-2.20.1-dont-move-windows.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=106249
 Patch2: skip-taskbar-tab.patch
 License: GPLv2+
@@ -69,7 +67,6 @@
 %prep
 %setup -q -n %{metacity_filename}
 %patch0 -p1 -b .default-theme
-%patch1 -p1 -b .dont-move-windows
 %patch2 -p1 -b .skip-taskbar-tab
 
 %build

skip-taskbar-tab.patch:

Index: skip-taskbar-tab.patch
===================================================================
RCS file: /cvs/extras/rpms/metacity/devel/skip-taskbar-tab.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- skip-taskbar-tab.patch	3 Feb 2008 06:28:38 -0000	1.1
+++ skip-taskbar-tab.patch	6 Feb 2008 06:40:07 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up metacity-2.21.5/src/window.h.skip-taskbar-tab metacity-2.21.5/src/window.h
---- metacity-2.21.5/src/window.h.skip-taskbar-tab	2008-02-03 01:21:30.000000000 -0500
-+++ metacity-2.21.5/src/window.h	2008-02-03 01:21:34.000000000 -0500
+diff -up metacity-2.21.5/src/core/window.h.skip-taskbar-tab metacity-2.21.5/src/core/window.h
+--- metacity-2.21.5/src/core/window.h.skip-taskbar-tab	2008-02-03 01:21:30.000000000 -0500
++++ metacity-2.21.5/src/core/window.h	2008-02-03 01:21:34.000000000 -0500
 @@ -558,7 +558,7 @@ gboolean meta_window_same_application (M
  #define META_WINDOW_IN_NORMAL_TAB_CHAIN(w) \
    (((w)->input || (w)->take_focus ) && META_WINDOW_IN_NORMAL_TAB_CHAIN_TYPE (w) && (!(w)->skip_taskbar))