rpms/openoffice.org/devel openoffice.org-1.9.125.ooo54586.nfslock.sal.patch, NONE, 1.1 openoffice.org.spec, 1.467, 1.468 openoffice.org-1.9.125.ooo53682.nfslock.sal.patch, 1.3, NONE

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11723

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.125.ooo54586.nfslock.sal.patch 
Removed Files:
	openoffice.org-1.9.125.ooo53682.nfslock.sal.patch 
Log Message:
nfs bug id change

openoffice.org-1.9.125.ooo54586.nfslock.sal.patch:
 file.cxx |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-1.9.125.ooo54586.nfslock.sal.patch ---
Index: sal/osl/unx/file.cxx
===================================================================
RCS file: /cvs/porting/sal/osl/unx/file.cxx,v
retrieving revision 1.8
diff -u -p -u -r1.8 file.cxx
--- openoffice.org.orig/sal/osl/unx/file.cxx	31 May 2005 17:07:41 -0000	1.8
+++ openoffice.org/sal/osl/unx/file.cxx	23 Aug 2005 16:42:43 -0000
@@ -650,6 +652,8 @@ oslFileError osl_openFile( rtl_uString* 
             fd = open( buffer, flags, mode );
             if ( fd >= 0 )
             {
+				sal_Bool got_flock;
+
                 /* check if file lock is enabled and clear l_type member of flock otherwise */
                 if( (char *) -1 == pFileLockEnvVar )
                 {
@@ -663,8 +667,21 @@ oslFileError osl_openFile( rtl_uString* 
                 if( NULL == pFileLockEnvVar )
                     aflock.l_type = 0;
 
+				got_flock = sal_False;
                 /* lock the file if flock.l_type is set */
-                if( F_WRLCK != aflock.l_type || -1 != fcntl( fd, F_SETLK, &aflock ) )
+                if( F_WRLCK != aflock.l_type)
+					got_flock = sal_True;
+				if( -1 != fcntl( fd, F_SETLK, &aflock ) )
+					got_flock = sal_True;
+				else if( errno == EAGAIN )
+					errno = EACCES; /* misleading synonym */
+				else if( errno == ENOLCK )
+				{ /* locking not supported */
+					errno = 0;
+					got_flock = sal_True;
+				}
+
+				if (got_flock)
                 {
                     /* allocate memory for impl structure */
                     pHandleImpl = (oslFileHandleImpl*) rtl_allocateMemory( sizeof(oslFileHandleImpl) );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -r1.467 -r1.468
--- openoffice.org.spec	13 Sep 2005 13:55:50 -0000	1.467
+++ openoffice.org.spec	14 Sep 2005 12:13:52 -0000	1.468
@@ -1,5 +1,5 @@
 %define ooo2ver 129
-%define ooo_rpm_release 2
+%define ooo_rpm_release 3
 %define build_fc5 1
 %define build_fc4 0
 %define build_rhel4 0
@@ -190,7 +190,7 @@
 Patch43: openoffice.org-1.9.112.ooo53025.exception.package.patch
 Patch44: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
 Patch45: openoffice.org-1.9.125.ooo53612.systemnp_sdk.extensions.patch
-Patch46: openoffice.org-1.9.125.ooo53682.nfslock.sal.patch
+Patch46: openoffice.org-1.9.125.ooo54586.nfslock.sal.patch
 Patch47: openoffice.org-1.9.125.ooo53699.uzipunused.postprocess.patch
 Patch48: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch
 Patch49: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
@@ -856,7 +856,7 @@
 %patch43 -p1 -b .ooo53025.exception.package.patch
 %patch44 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
 %patch45 -p1 -b .ooo53612.systemnp_sdk.extensions.patch
-%patch46 -p1 -b .ooo53682.nfslock.sal.patch
+%patch46 -p1 -b .ooo54586.nfslock.sal.patch
 %patch47 -p1 -b .ooo53699.uzipunused.postprocess.patch
 %patch48 -p1 -b .ooo53723.bulletexport.vcl.patch
 %patch49 -p1 -b .ooo30380.uselibxslt.xmlhelp.patch
@@ -3208,6 +3208,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Wed Sep 14 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.129-3.pending
+- track nfs bug id change
+
 * Tue Sep 13 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.129-2
 - fix icu usage
 


--- openoffice.org-1.9.125.ooo53682.nfslock.sal.patch DELETED ---