--- a/base-specs/nautilus.spec	Thu May 07 08:05:10 2009 +0000
+++ b/base-specs/nautilus.spec	Thu May 07 09:00:50 2009 +0000
@@ -53,14 +53,8 @@
 Patch11:       nautilus-11-update-bookmarks.diff
 #owner:erwannc date:2008-08-28 type:feature bugster:6738643
 Patch13:       nautilus-13-zfs-snapshot.diff
-%if %option_with_sun_branding
 #owner:gman date:2006-04-25 type:branding
 Patch14:      nautilus-14-interface-changes.diff
-%endif
-%if %option_with_indiana_branding
-#owner:gman date:2007-10-19 type:branding
-Patch14:      nautilus-14-interface-changes-indiana.diff
-%endif
 
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/nautilus2
@@ -148,12 +142,7 @@
 %patch10 -p1
 %patch11 -p1
 %patch13 -p1
-%if %option_with_sun_branding
 %patch14 -p1
-%endif
-%if %option_with_indiana_branding
-%patch14 -p1
-%endif
 
 cp %SOURCE4 icons
 cp %SOURCE5 icons
@@ -255,6 +244,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu May  7 2009 - [email protected]
+- Merge 14-interface-changes and 14-interfance-changes-indiana into one patch.
 * Wed Apr 15 2009 - [email protected]
 - Bump to 2.26.2
 * Tue Mar 17 2009 - [email protected]