--- a/ChangeLog	Wed Aug 13 23:50:52 2008 +0000
+++ b/ChangeLog	Mon Aug 18 21:54:10 2008 +0000
@@ -1,3 +1,10 @@
+2008-08-17  Laszlo (Laca) Peter  <[email protected]>
+
+	* patches/opensolaris-welcome-01-Desktop-dir.diff: (new) - patch
+	  that makes sure $HOME/Desktop is created before copying files there
+        * indiana/SUNWopensolaris-welcome.spec: add patch Desktop-dir.diff
+	* patches/opensolaris-welcome-01-comment-out.diff: (delete) unused
+
 2008-08-14  Laszlo (Laca) Peter  <[email protected]>
 
 	* indiana/SUNWopensolaris-welcome.spec: also merge the -root pkg

--- a/indiana/SUNWopensolaris-welcome.spec	Wed Aug 13 23:50:52 2008 +0000
+++ b/indiana/SUNWopensolaris-welcome.spec	Mon Aug 18 21:54:10 2008 +0000
@@ -11,6 +11,7 @@
 Summary:             OpenSolaris Welcome document
 Version:             0.0.7
 Source:              http://dlc.sun.com/osol/jds/downloads/extras/opensolaris-welcome/opensolaris-welcome-%{version}.tar.bz2
+Patch1:              opensolaris-welcome-01-Desktop-dir.diff
 SUNW_BaseDir:        /
 SUNW_Copyright:      %{name}.copyright
 BuildRoot:           %{_tmppath}/%{name}-%{version}-build
@@ -18,6 +19,7 @@
 
 %prep
 %setup -q -n opensolaris-welcome-%{version}
+%patch1 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -117,6 +119,9 @@
 %attr (-, root, sys) %{_sysconfdir}/xdg/autostart/*
 
 %changelog
+* Sun Aug 17 2008 - [email protected]
+- add patch Desktop-dir.diff that makes sure $HOME/Desktop is created
+  before copying files there
 * Thu Aug 14 2008 - [email protected]
 - also merge the -root pkg in to the base pkg
 * Thu Aug 14 2008 - [email protected]

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/opensolaris-welcome-01-Desktop-dir.diff	Mon Aug 18 21:54:10 2008 +0000
@@ -0,0 +1,30 @@
+Index: opensolaris-welcome/opensolaris-icons-copy.sh
+===================================================================
+--- opensolaris-welcome/opensolaris-icons-copy.sh	(revision 72)
++++ opensolaris-welcome/opensolaris-icons-copy.sh	(working copy)
+@@ -1,8 +1,19 @@
+ #!/bin/sh
+-if [ ! -f $HOME/.os-icons-installed ] 
+-then
+-  cp /usr/share/applications/register-opensolaris.desktop $HOME/Desktop
+-  cp /usr/share/applications/packagemanager.desktop $HOME/Desktop
+-  /bin/touch $HOME/.os-icons-installed
++
++MARKER_DIR="$HOME/.gnome2"
++MARKER=".os-icons-installed"
++DESKTOP_DIR="$HOME/Desktop"
++APPDIR=/usr/share/applications
++DESKTOP_FILES="register-opensolaris.desktop packagemanager.desktop"
++
++/bin/mkdir -p $MARKER_DIR
++
++if [ ! -f "$MARKER_DIR/$MARKER" ]; then
++    /bin/mkdir -p "$DESKTOP_DIR"
++    for dtfile in $DESKTOP_FILES; do
++        /bin/cp "$APPDIR/$dtfile" "$DESKTOP_DIR"
++        /bin/chmod u+w "$DESKTOP_DIR/$dtfile"
++    done
++    /bin/mkdir -p "$MARKER_DIR"
++    /bin/touch "$MARKER_DIR/$MARKER"
+ fi
+-

--- a/patches/opensolaris-welcome-01-comment-out.diff	Wed Aug 13 23:50:52 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
---- opensolaris-welcome-0.0.1/html/index.html.orig	2008-04-14 18:38:20.698714000 +0900
-+++ opensolaris-welcome-0.0.1/html/index.html	2008-04-14 18:42:36.192313000 +0900
-@@ -9,6 +9,7 @@ if(window.document == parent.document)
-   var langurl='C/index.html';
-   var langinfo=navigator.language? navigator.language : navigator.userLanguage
- 
-+/* Comment lines until we deliver the translations.
-   if(langinfo.substr(0,2) == "en") {
-     langurl='C/index.html';
-   } else if(langinfo == "pt-BR") {
-@@ -29,6 +30,7 @@ if(window.document == parent.document)
-             langinfo.substr(0,2) == "sv") {
-     langurl=langinfo.substr(0,2) + '/index.html';
-   }
-+*/
- //  else {
- //    langurl=langinfo.substr(0,2) + '/index.html';
- //  }
-@@ -44,6 +46,7 @@ if(window.document == parent.document)
- This page will automatically redirect in a moment...<br/>
- <ul>
- <li><a href="C/index.html">English Welcome page</a></li>
-+<!--
- <li><a href="de/index.html">German Welcome page</a></li>
- <li><a href="es/index.html">Spanish Welcome page</a></li>
- <li><a href="fr/index.html">French Welcome page</a></li>
-@@ -56,6 +59,7 @@ This page will be jumped automatically.<
- <li><a href="zh_CN/index.html">Simplified Chinese Welcome page</a></li>
- <li><a href="zh_HK/index.html">Hong Kong Chinese Welcome page</a></li>
- <li><a href="zh_TW/index.html">Traditional Chinese Welcome page</a></li>
-+-->
- </ul>
- </body>
- </html>