--- a/base-specs/metacity.spec	Thu Nov 13 04:57:30 2008 +0000
+++ b/base-specs/metacity.spec	Thu Nov 13 05:19:20 2008 +0000
@@ -33,22 +33,18 @@
 %endif
 #owner:gman  date:2003-11-20   type:branding
 Patch3:       metacity-03-ctrl-alt-del.diff
-#owner:erwannc date:2004-04-30 type:branding
-Patch4:       metacity-04-sunpowerswitch-key.diff
 #owner:erwannc date:2004-07-23 type:feature
-Patch5:       metacity-05-raise-on-frame-click.diff
+Patch4:       metacity-04-raise-on-frame-click.diff
 #owner:erwannc date:2004-10-06 type:bug bugster:5101706
-Patch6:       metacity-06-logout-shortcut.diff
-#owner:erwannc date:2006-05-12 type:branding
-Patch7:       metacity-07-branding-hack.diff
+Patch5:       metacity-05-branding-hack.diff
 #owner:erwannc date:2006-11-02 type:feature bugster:6393724
-Patch8:       metacity-08-trusted-extensions.diff
+Patch6:       metacity-06-trusted-extensions.diff
 #owner:bewitche date:2008-05-23 type:bug bugster:6676458 bugzilla:156543
-Patch9:      metacity-09-wireframe.diff
+Patch7:      metacity-07-wireframe.diff
 #owner:erwannc date:2008-06-02 type:feature bugster:0000000
-Patch10:      metacity-10-remove-xopen-source-posix.diff
+Patch8:      metacity-08-remove-xopen-source-posix.diff
 #owner:yippi date:2008-10-27 type:bug bugzilla:558058
-Patch11:      metacity-11-fixcrash.diff
+Patch9:      metacity-09-fixcrash.diff
 
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -91,8 +87,6 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
-%patch11 -p1
 
 %build
 %ifos linux
@@ -170,6 +164,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Nov 11 2008 - [email protected]
+- Remove 04-sunpowerswitch-key.diff, 06-logout-shortcut.diff and reorder
+  the others.
 * Mon Oct 27 2008 - [email protected]
 - Add patch metacity-11-fixcrash.diff to fix a crashing issue noticed
   when using metacity with the new GDM 2.24.