rpms/openoffice.org/devel openoffice.org-3.0.1.ooo96906.ucb.symlinks.and.size.patch, NONE, 1.1 openoffice.org.spec, 1.1706, 1.1707

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2040

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.1.ooo96906.ucb.symlinks.and.size.patch 
Log Message:
add openoffice.org-3.0.1.ooo96906.ucb.symlinks.and.size.patch

openoffice.org-3.0.1.ooo96906.ucb.symlinks.and.size.patch:

--- NEW FILE openoffice.org-3.0.1.ooo96906.ucb.symlinks.and.size.patch ---
Index: source/ucp/file/shell.cxx
===================================================================
RCS file: /cvs/ucb/ucb/source/ucp/file/shell.cxx,v
retrieving revision 1.97.18.1
diff -u -r1.97.18.1 shell.cxx
--- openoffice.org.orig/ucb/source/ucp/file/shell.cxx	21 Aug 2008 15:23:40 -0000	1.97.18.1
+++ openoffice.org/ucb/source/ucp/file/shell.cxx	4 Dec 2008 16:29:40 -0000
@@ -2296,6 +2296,10 @@
 
 
 	sal_Bool isDirectory,isFile,isVolume,isRemoveable,isRemote,isFloppy,isCompactDisc;
+    sal_Int64 dirSize = 0;
+
+    if( aFileStatus.isValid( FileStatusMask_FileSize ) )
+        dirSize = aFileStatus.getFileSize();
 
 	if( aFileStatus.isValid( FileStatusMask_Type ) )
 	{
@@ -2314,6 +2318,8 @@
 					osl::FileStatus::Directory == aFileStatus2.getFileType();
 				isFile =
 					osl::FileStatus::Regular == aFileStatus2.getFileType();
+                if( aFileStatus2.isValid( FileStatusMask_FileSize ) )
+                    dirSize = aFileStatus2.getFileSize();
 			}
 			else
 			{
@@ -2395,17 +2401,8 @@
 	it1 = properties.find( MyProperty( Size ) );
 	if( it1 != properties.end() )
 	{
-		if( aFileStatus.isValid( FileStatusMask_FileSize ) )
-		{
-			aAny <<= sal_Int64( aFileStatus.getFileSize() );
-			it1->setValue( aAny );
-		}
-		else
-		{
-			sal_Int64 dirSize = 0;
-			aAny <<= dirSize;
-			it1->setValue( aAny );
-		}
+		aAny <<= dirSize;
+		it1->setValue( aAny );
 	}
 
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1706
retrieving revision 1.1707
diff -u -r1.1706 -r1.1707
--- openoffice.org.spec	1 Dec 2008 23:15:06 -0000	1.1706
+++ openoffice.org.spec	4 Dec 2008 23:05:34 -0000	1.1707
@@ -1,6 +1,6 @@
 %define oootag OOO300
 %define ooomilestone 12
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -129,6 +129,7 @@
 Patch56: openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch
 Patch57: openoffice.org-3.0.0.ooo96279.swext.mediawiki.proxies.patch
 Patch58: openoffice.org-3.0.0.ooo96391.sw.prefsalwaysmodified.patch
+Patch59: openoffice.org-3.0.1.ooo96906.ucb.symlinks.and.size.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1382,6 +1383,7 @@
 %patch56 -p1 -b .ooo96203.sfx2.3layer-qstart.patch
 %patch57 -p1 -b .ooo96279.swext.mediawiki.proxies.patch
 %patch58 -p1 -b .ooo96391.sw.prefsalwaysmodified.patch
+%patch59 -p1 -b .ooo96906.ucb.symlinks.and.size.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3748,6 +3750,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Thu Dec 04 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-12.3
+- add openoffice.org-3.0.1.ooo96906.ucb.symlinks.and.size.patch
+
 * Mon Dec 01 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-12.2
 - Resolves: rhbz#474058 messy patch
 - Resolves: rhbz#473570 Add dejavu requires