rpms/openoffice.org/devel openoffice.org-1.9.121.rh164310.selinux-pipegiveup.desktop.patch, NONE, 1.1 openoffice.org.spec, 1.360, 1.361
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jul 27 08:53:29 UTC 2005
- Previous message (by thread): rpms/pygtk2/devel .cvsignore, 1.18, 1.19 pygtk.spec, 1.31, 1.32 sources, 1.18, 1.19
- Next message (by thread): rpms/tar/devel tar-1.15.1-sparseTotals.patch, NONE, 1.1 tar.spec, 1.23, 1.24
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv642
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-1.9.121.rh164310.selinux-pipegiveup.desktop.patch
Log Message:
rh#164310# pipe giveup
openoffice.org-1.9.121.rh164310.selinux-pipegiveup.desktop.patch:
desktop/source/app/officeipcthread.cxx | 4 ++++
source/app/officeipcthread.cxx | 0
2 files changed, 4 insertions(+)
--- NEW FILE openoffice.org-1.9.121.rh164310.selinux-pipegiveup.desktop.patch ---
Index: source/app/officeipcthread.cxx
===================================================================
RCS file: /cvs/framework/desktop/source/app/officeipcthread.cxx,v
retrieving revision 1.47
diff -u -p -u -r1.47 officeipcthread.cxx
--- openoffice.org.orig/desktop/source/app/officeipcthread.cxx 18 Apr 2005 14:43:23 -0000 1.47
+++ openoffice.org/desktop/source/app/officeipcthread.cxx 27 Jul 2005 07:54:41 -0000
@@ -376,6 +376,10 @@ OfficeIPCThread::Status OfficeIPCThread:
}
else
{
+ OPipe::TPipeError eReason = pThread->maPipe.getError();
+ if ((eReason == OPipe::E_ConnectionRefused) || (eReason == OPipe::E_invalidError))
+ return IPC_STATUS_BOOTSTRAP_ERROR;
+
// Wait for second office to be ready
TimeValue aTimeValue;
aTimeValue.Seconds = 0;
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -r1.360 -r1.361
--- openoffice.org.spec 26 Jul 2005 14:54:04 -0000 1.360
+++ openoffice.org.spec 27 Jul 2005 08:53:27 -0000 1.361
@@ -1,5 +1,5 @@
%define ooo2ver 121
-%define ooo_rpm_release 2
+%define ooo_rpm_release 3
%define build_fc4 0
%define build_fc5 1
@@ -165,6 +165,7 @@
Patch58: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
Patch59: openoffice.org-1.9.121.rh127576.gnomeprintui.patch
Patch60: openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
+Patch61: openoffice.org-1.9.121.rh164310.selinux-pipegiveup.desktop.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -822,6 +823,7 @@
%if %{cripplemenus}
%patch60 -p1 -b .rh156677.cripplemenus.sysui.patch
%endif
+%patch61 -p1 -b .rh164310.selinux-pipegiveup.desktop.patch
%if %{includeexternals}
#start ludicrous workaround
@@ -3067,6 +3069,9 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Wed Jul 27 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.121-3
+- add rh#164310# pipe giveup
+
* Tue Jul 26 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.121-2
- rh#127576# add libgnomeprintui
- make database front end into pseudo subpackage
- Previous message (by thread): rpms/pygtk2/devel .cvsignore, 1.18, 1.19 pygtk.spec, 1.31, 1.32 sources, 1.18, 1.19
- Next message (by thread): rpms/tar/devel tar-1.15.1-sparseTotals.patch, NONE, 1.1 tar.spec, 1.23, 1.24
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list