--- a/branding-SUNWgnome-panel.patch Sun Oct 24 11:11:04 2010 +0200
+++ b/branding-SUNWgnome-panel.patch Sat Nov 27 11:01:16 2010 +0100
@@ -3,7 +3,7 @@
# Date 1284715013 -7200
# Branch gnome-2-30
# Node ID 143a28e3e1713bdd56f8bbea470f4fbde66db691
-# Parent 6ea38ee83f1366f8ac2d4bfc1df2303f0bca5f28
+# Parent 0b03ecadefe7d7f4f52ed7ffd2595a50774b81ec
rebranded SUNWgnome-panel
diff --git a/base-specs/gnome-desktop.spec b/base-specs/gnome-desktop.spec
@@ -37,7 +37,19 @@
diff --git a/base-specs/gnome-panel.spec b/base-specs/gnome-panel.spec
--- a/base-specs/gnome-panel.spec
+++ b/base-specs/gnome-panel.spec
-@@ -40,6 +40,10 @@
+@@ -28,7 +28,11 @@
+ Source4: %{name}-po-sun-%{po_sun_version}.tar.bz2
+ Source5: l10n-configure.sh
+ Source6: top-panel-image.png
++%if %option_with_openindiana_branding
++Source7: bottom-panel-image-openindiana.png
++%else
+ Source7: bottom-panel-image.png
++%endif
+ %if %build_l10n
+ Source8: l10n-configure.sh
+ %endif
+@@ -40,6 +44,10 @@
# date:2007-10-24 type:branding owner:gman
Patch1: gnome-panel-01-default-setup-indiana.diff
%endif
@@ -48,7 +60,7 @@
# date:2004-09-30 type:branding owner:mattman
Patch2: gnome-panel-02-fish-applet.diff
# date:2004-10-18 type:feature bugster:4984097 owner:mattman
-@@ -54,6 +58,9 @@
+@@ -54,6 +62,9 @@
# date:2006-05-03 type:branding owner:gman
Patch8: gnome-panel-08-launch-menu-indiana.diff
%endif
@@ -58,7 +70,7 @@
%if %option_with_sun_branding
# date:2006-05-03 type:branding owner:gman
Patch8: gnome-panel-08-launch-menu.diff
-@@ -137,6 +144,9 @@
+@@ -137,6 +148,9 @@
%if %option_with_indiana_branding
%patch1 -p1
%endif
@@ -68,7 +80,7 @@
%patch2 -p1
%patch3 -p1
%patch5 -p1
-@@ -145,6 +155,9 @@
+@@ -145,6 +159,9 @@
%if %option_with_indiana_branding
%patch8 -p1
%endif
@@ -78,6 +90,15 @@
%if %option_with_sun_branding
%patch8 -p1
%patch9 -p1
+@@ -159,7 +176,7 @@
+
+ cp %SOURCE3 icons
+ cp %SOURCE6 icons
+-cp %SOURCE7 icons
++cp %SOURCE7 icons/bottom-panel-image.png
+ %if %option_with_sun_branding
+ cp %SOURCE1 icons/gnome-main-menu.png
+ %endif
diff --git a/patches/gnome-desktop-01-jds-about-branding-openindiana.diff b/patches/gnome-desktop-01-jds-about-branding-openindiana.diff
new file mode 100644
--- /dev/null