rpms/openoffice.org/F-10 openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch, NONE, 1.1 openoffice.org.spec, 1.1690, 1.1691

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20777

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch 
Log Message:
Resolves: rhbz#471485 openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch

openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch:

--- NEW FILE openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch ---
Index: source/appl/shutdownicon.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/appl/shutdownicon.cxx,v
retrieving revision 1.64
diff -u -r1.64 shutdownicon.cxx
--- openoffice.org.orig/sfx2/source/appl/shutdownicon.cxx	22 Jul 2008 17:51:23 -0000	1.64
+++ openoffice.org/sfx2/source/appl/shutdownicon.cxx	14 Nov 2008 09:08:28 -0000
@@ -63,10 +63,11 @@
 #include <tools/urlobj.hxx>
 #include <osl/security.hxx>
 #include <osl/file.hxx>
-#include <unotools/bootstrap.hxx>
+#include <rtl/bootstrap.hxx>
 #include <tools/link.hxx>
 #ifdef UNX // need symlink
 #include <unistd.h>
+#include <errno.h>
 #endif
 
 #include "sfxresid.hxx"
@@ -826,8 +827,8 @@
 #else // UNX
 		getDotAutostart( true );
 
-		OUString aPath;
-		::utl::Bootstrap::locateBaseInstallation(aPath);
+                OUString aPath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR"));
+                ::rtl::Bootstrap::expandMacros(aPath);
 
 		OUString aDesktopFile;
 		::osl::File::getSystemPathFromFileURL( aPath, aDesktopFile );
@@ -837,7 +838,12 @@
 													 osl_getThreadTextEncoding() );
 		OString aShortcutUnx = OUStringToOString( aShortcut,
 												  osl_getThreadTextEncoding() );
-		symlink( aDesktopFileUnx, aShortcutUnx );
+
+        if ((0 != symlink(aDesktopFileUnx, aShortcutUnx)) && (errno == EEXIST))
+        {
+            unlink(aShortcutUnx);
+            symlink(aDesktopFileUnx, aShortcutUnx);
+        }
 
 		ShutdownIcon *pIcon = ShutdownIcon::createInstance();
 		if( pIcon )


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org.spec,v
retrieving revision 1.1690
retrieving revision 1.1691
diff -u -r1.1690 -r1.1691
--- openoffice.org.spec	10 Nov 2008 12:36:09 -0000	1.1690
+++ openoffice.org.spec	14 Nov 2008 09:18:22 -0000	1.1691
@@ -129,6 +129,7 @@
 Patch56: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch
 Patch57: openoffice.org-3.0.0.ooo95908.pyuno.debugging.spew.patch
 Patch58: openoffice.org-3.0.0.ooo90072.sw.undo-longtext.patch
+Patch59: openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1382,6 +1383,7 @@
 %patch56 -p1 -b .ooo95834.dontset-nonfunctional-forward.patch
 %patch57 -p1 -b .ooo95908.pyuno.debugging.spew.patch
 %patch58 -p1 -b .ooo90072.sw.undo-longtext.patch
+%patch59 -p1 -b .ooo96203.sfx2.3layer-qstart.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3747,9 +3749,10 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Mon Nov 10 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.11
+* Fri Nov 10 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.11
 - Resolves: rhbz#470302 g_file_input_stream_query_info doesn't do anything 
   remotely
+- Resolves: rhbz#471485 openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch
 
 * Fri Nov 07 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.10
 - window manager hatred