--- a/base-specs/metacity.spec	Fri Apr 11 14:20:24 2008 +0000
+++ b/base-specs/metacity.spec	Fri Apr 11 15:33:29 2008 +0000
@@ -21,10 +21,8 @@
 %if %build_l10n
 Source2:                 l10n-configure.sh
 %endif
-%if %option_with_sun_branding
 #owner:erwannc date:2000-00-00 type:branding
 Patch1:       metacity-01-default-theme.diff
-%endif
 #owner:gheet date:2003-07-17   type:branding
 Patch2:       metacity-02-ctrl-esc-mod4-r.diff
 #owner:gman  date:2003-11-20   type:branding
@@ -76,9 +74,7 @@
 bzcat %SOURCE1 | tar xf -
 cd po-sun; make; cd ..
 %endif
-%if %option_with_sun_branding
 %patch1 -p1
-%endif
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1