--- a/base-specs/metacity.spec Thu Dec 11 14:41:06 2008 +0000
+++ b/base-specs/metacity.spec Thu Dec 11 14:45:55 2008 +0000
@@ -23,28 +23,24 @@
%endif
#owner:erwannc date:2000-00-00 type:branding
Patch1: metacity-01-default-theme.diff
-%if %option_with_sun_branding
-#owner:jedy date:2008-09-05 type:branding
-Patch2: metacity-02-shortcut.diff
-%endif
%if %option_with_indiana_branding
#owner:jedy date:2008-09-05 type:branding
Patch2: metacity-02-shortcut-indiana.diff
%endif
-#owner:gman date:2003-11-20 type:branding
-Patch3: metacity-03-ctrl-alt-del.diff
-#owner:erwannc date:2004-07-23 type:feature
-Patch4: metacity-04-raise-on-frame-click.diff
+%if %option_with_sun_branding
+#owner:jedy date:2008-09-05 type:branding
+Patch3: metacity-03-shortcut.diff
+%endif
#owner:erwannc date:2004-10-06 type:bug bugster:5101706
-Patch5: metacity-05-branding-hack.diff
+Patch4: metacity-04-branding-hack.diff
#owner:erwannc date:2006-11-02 type:feature bugster:6393724
-Patch6: metacity-06-trusted-extensions.diff
+Patch5: metacity-05-trusted-extensions.diff
#owner:bewitche date:2008-05-23 type:bug bugster:6676458 bugzilla:156543
-Patch7: metacity-07-wireframe.diff
+Patch6: metacity-06-wireframe.diff
#owner:erwannc date:2008-06-02 type:feature bugster:0000000
-Patch8: metacity-08-remove-xopen-source-posix.diff
-#owner:yippi date:2008-10-27 type:bug bugzilla:558058
-Patch9: metacity-09-fixcrash.diff
+Patch7: metacity-07-remove-xopen-source-posix.diff
+#owner:erwannc date:2008-12-11 type:bug bugzilla:564123
+Patch8: metacity-08-broken-configure.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -74,19 +70,17 @@
cd po-sun; make; cd ..
%endif
%patch1 -p1
-%if %option_with_sun_branding
-%patch2 -p1
-%endif
%if %option_with_indiana_branding
%patch2 -p1
%endif
+%if %option_with_sun_branding
%patch3 -p1
+%endif
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
-%patch9 -p1
%build
%ifos linux