--- a/base-specs/nimbus.spec	Fri Sep 17 11:43:37 2010 +0200
+++ b/base-specs/nimbus.spec	Fri Sep 17 11:43:53 2010 +0200
@@ -24,6 +24,7 @@
 Source:       http://dlc.sun.com/osol/jds/downloads/extras/nimbus/%{name}-%{tarball_version}.tar.bz2
 Source1:      nimbus-media-play-rtl.png
 Source2:      start-here.tar.bz2
+Source1000:   nimbus-icons-openindiana.tar.bz2
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 URL:          http://www.sun.com/software/javadesktopsystem/
 ## %SOURCE1 .png file needs to be upstreamed when the %patch2 
@@ -32,6 +33,7 @@
 Patch2:       nimbus-02-rtl-icons.diff
 #owner:fujiwara date:2009-04-22 type:bug bugster:6641239
 Patch3:       nimbus-03-rtl-option-menu.diff
+Patch1000:    nimbus-1000-dmz-cursor-theme.diff
 
 %define gtk2_version 2.4.0
 %define intltool_version 0.30
@@ -44,12 +46,20 @@
 %prep
 %setup -q -n %name-%tarball_version
 cp %SOURCE1 gtk-engine/gtk-2.0/media-play-rtl.png
+%if %option_with_openindiana_branding
+cp %SOURCE1000 nimbus-icons-openindiana.tar.bz2
+bzcat nimbus-icons-openindiana.tar.bz2 | tar -xf -
+%else
 gtar jxvf %SOURCE2 
 mv start-here-24.png icons/24x24/places/start-here.png
 mv start-here-32.png icons/32x32/places/start-here.png
 mv start-here-48.png icons/48x48/places/start-here.png
+%endif
 %patch2 -p1
 %patch3 -p1
+%if %option_with_openindiana_branding
+%patch1000 -p1
+%endif
 
 %build
 %ifos linux

Binary file ext-sources/nimbus-icons-openindiana.tar.bz2 has changed

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/nimbus-1000-dmz-cursor-theme.diff	Fri Sep 17 11:43:53 2010 +0200
@@ -0,0 +1,48 @@
+diff -ur nimbus-0.1.5.orig/dark-index.theme nimbus-0.1.5/dark-index.theme
+--- nimbus-0.1.5.orig/dark-index.theme	2010-10-02 17:02:51.000000000 +0200
++++ nimbus-0.1.5/dark-index.theme	2010-10-03 11:44:36.000000000 +0200
+@@ -8,3 +8,4 @@
+ GtkTheme=dark-nimbus
+ IconTheme=nimbus
+ MetacityTheme=dark-nimbus
++CursorTheme=DMZ-White
+diff -ur nimbus-0.1.5.orig/dark-index.theme.in nimbus-0.1.5/dark-index.theme.in
+--- nimbus-0.1.5.orig/dark-index.theme.in	2010-10-02 16:55:56.000000000 +0200
++++ nimbus-0.1.5/dark-index.theme.in	2010-10-03 11:44:43.000000000 +0200
+@@ -8,3 +8,4 @@
+ GtkTheme=dark-nimbus
+ IconTheme=nimbus
+ MetacityTheme=dark-nimbus
++CursorTheme=DMZ-White
+diff -ur nimbus-0.1.5.orig/index.theme nimbus-0.1.5/index.theme
+--- nimbus-0.1.5.orig/index.theme	2010-10-02 17:02:51.000000000 +0200
++++ nimbus-0.1.5/index.theme	2010-10-03 11:44:58.000000000 +0200
+@@ -8,3 +8,4 @@
+ GtkTheme=nimbus
+ IconTheme=nimbus
+ MetacityTheme=nimbus
++CursorTheme=DMZ-White
+diff -ur nimbus-0.1.5.orig/index.theme.in nimbus-0.1.5/index.theme.in
+--- nimbus-0.1.5.orig/index.theme.in	2010-10-02 16:55:56.000000000 +0200
++++ nimbus-0.1.5/index.theme.in	2010-10-03 11:45:04.000000000 +0200
+@@ -8,3 +8,4 @@
+ GtkTheme=nimbus
+ IconTheme=nimbus
+ MetacityTheme=nimbus
++CursorTheme=DMZ-White
+diff -ur nimbus-0.1.5.orig/light-index.theme nimbus-0.1.5/light-index.theme
+--- nimbus-0.1.5.orig/light-index.theme	2010-10-02 17:02:51.000000000 +0200
++++ nimbus-0.1.5/light-index.theme	2010-10-03 11:45:10.000000000 +0200
+@@ -8,3 +8,4 @@
+ GtkTheme=light-nimbus
+ IconTheme=nimbus
+ MetacityTheme=light-nimbus
++CursorTheme=DMZ-White
+diff -ur nimbus-0.1.5.orig/light-index.theme.in nimbus-0.1.5/light-index.theme.in
+--- nimbus-0.1.5.orig/light-index.theme.in	2010-10-02 16:55:56.000000000 +0200
++++ nimbus-0.1.5/light-index.theme.in	2010-10-03 11:45:16.000000000 +0200
+@@ -8,3 +8,4 @@
+ GtkTheme=light-nimbus
+ IconTheme=nimbus
+ MetacityTheme=light-nimbus
++CursorTheme=DMZ-White

--- a/specs/SUNWnimbus.spec	Fri Sep 17 11:43:37 2010 +0200
+++ b/specs/SUNWnimbus.spec	Fri Sep 17 11:43:53 2010 +0200
@@ -30,6 +30,9 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
+%if %option_with_openindiana_branding
+Requires:      SUNWdmz-cursor
+%endif
 BuildRequires: SUNWgtk2
 BuildRequires: SUNWgtk2-devel
 BuildRequires: SUNWicon-naming-utils