rpms/openoffice.org/devel openoffice.org-1.9.112.ooo53025.exception.package.patch, NONE, 1.1 openoffice.org-1.9.121.ooo53026.selinux-pipegiveup.desktop.patch, NONE, 1.1 .cvsignore, 1.68, 1.69 openoffice.org-1.9.80.NONE.skipuselessmodules.patch, 1.2, 1.3 openoffice.org.spec, 1.375, 1.376 sources, 1.95, 1.96 openoffice.org-1.9.112.oooXXXXX.exception.package.patch, 1.1, NONE openoffice.org-1.9.121.rh164310.selinux-pipegiveup.desktop.patch, 1.1, NONE workspace.cmcfixes12, 1.4, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Aug 8 14:58:31 UTC 2005
- Previous message (by thread): rpms/gcc/devel gcc4-libffi-ppc-cfi.patch, NONE, 1.1 .cvsignore, 1.103, 1.104 gcc4-stack-protector.patch, 1.3, 1.4 gcc4.spec, 1.61, 1.62 sources, 1.105, 1.106 gcc4-fortran-equiv.patch, 1.1, NONE
- Next message (by thread): rpms/kdeaccessibility/devel .cvsignore, 1.5, 1.6 kdeaccessibility.spec, 1.6, 1.7 sources, 1.5, 1.6 admin-visibility.patch, 1.3, NONE kdeaccessibility-3.4.1-gcc4.patch, 1.1, NONE
- 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-serv27197
Modified Files:
.cvsignore openoffice.org-1.9.80.NONE.skipuselessmodules.patch
openoffice.org.spec sources
Added Files:
openoffice.org-1.9.112.ooo53025.exception.package.patch
openoffice.org-1.9.121.ooo53026.selinux-pipegiveup.desktop.patch
Removed Files:
openoffice.org-1.9.112.oooXXXXX.exception.package.patch
openoffice.org-1.9.121.rh164310.selinux-pipegiveup.desktop.patch
workspace.cmcfixes12
Log Message:
next version
openoffice.org-1.9.112.ooo53025.exception.package.patch:
package/source/xstor/oseekinstream.cxx | 4 ++--
source/xstor/oseekinstream.cxx | 0
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE openoffice.org-1.9.112.ooo53025.exception.package.patch ---
Index: source/xstor/oseekinstream.cxx
===================================================================
RCS file: /cvs/xml/package/source/xstor/oseekinstream.cxx,v
retrieving revision 1.3
diff -u -p -u -r1.3 oseekinstream.cxx
--- openoffice.org.orig/package/source/xstor/oseekinstream.cxx 3 Feb 2004 17:58:27 -0000 1.3
+++ openoffice.org/package/source/xstor/oseekinstream.cxx 5 Aug 2005 14:56:01 -0000
@@ -228,10 +228,10 @@ sal_Int64 SAL_CALL OInputSeekStream::get
{
::osl::MutexGuard aGuard( m_rMutexRef->GetMutex() );
if ( m_bDisposed )
- throw lang::DisposedException();
+ return 0;
if ( !m_xSeekable.is() )
- throw uno::RuntimeException();
+ return 0;
return m_xSeekable->getLength();
}
openoffice.org-1.9.121.ooo53026.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.ooo53026.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: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- .cvsignore 2 Aug 2005 13:47:50 -0000 1.68
+++ .cvsignore 8 Aug 2005 14:58:29 -0000 1.69
@@ -126,3 +126,4 @@
gcj-sed.sh
SRC680_m121.tar.bz2
SRC680_m122.tar.bz2
+SRC680_m123.tar.bz2
openoffice.org-1.9.80.NONE.skipuselessmodules.patch:
postprocess/prj/build.lst | 5 ++---
prj/build.lst | 0
2 files changed, 2 insertions(+), 3 deletions(-)
Index: openoffice.org-1.9.80.NONE.skipuselessmodules.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.80.NONE.skipuselessmodules.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-1.9.80.NONE.skipuselessmodules.patch 22 Jun 2005 07:37:02 -0000 1.2
+++ openoffice.org-1.9.80.NONE.skipuselessmodules.patch 8 Aug 2005 14:58:29 -0000 1.3
@@ -1,11 +1,3 @@
---- SRC680_m84/wizards/prj/build.lst.orig 2005-03-11 11:21:32.000000000 +0000
-+++ SRC680_m84/wizards/prj/build.lst 2005-03-11 11:21:47.000000000 +0000
-@@ -1,4 +1,4 @@
--wz wizards : rsc javaunohelper jut unoil qadevOOo xalan transex3 NULL
-+wz wizards : rsc javaunohelper jut unoil SO:qadevOOo xalan transex3 NULL
- wz wizards\util nmake - all wz_util NULL
- wz wizards\source\config nmake - all wz_config NULL
- wz wizards\source\euro nmake - all wz_eurowiz NULL
Index: prj/build.lst
===================================================================
RCS file: /cvs/installation/postprocess/prj/build.lst,v
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -r1.375 -r1.376
--- openoffice.org.spec 8 Aug 2005 08:06:48 -0000 1.375
+++ openoffice.org.spec 8 Aug 2005 14:58:29 -0000 1.376
@@ -1,5 +1,5 @@
-%define ooo2ver 122
-%define ooo_rpm_release 5
+%define ooo2ver 123
+%define ooo_rpm_release 1
%define build_fc4 0
%define build_fc5 1
@@ -172,18 +172,17 @@
Patch54: openoffice.org-1.9.117.ooo52048.inhalt.sw.patch
Patch55: openoffice.org-1.9.117.rh150643.fontconfigalwayssystemfont.vcl.patch
Patch56: openoffice.org-1.9.117.ooo49720.mozillanspr.extensions.patch
-Patch57: workspace.cmcfixes12
-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
-Patch62: openoffice.org-1.9.121.ooo52542.emptyrtfframes.sw.patch
-Patch63: openoffice.org-1.9.122.oooXXXXX.parallel.solenv.patch
-Patch64: openoffice.org-1.9.122.ooo52786.czech8bitdocimport.patch
-Patch65: openoffice.org-1.9.122.ooo52974.systemhsqldb.patch
-Patch66: openoffice.org-1.9.122.ooo52974.systembeanshell.patch
-Patch67: openoffice.org-1.9.122.ooo52626.workspacerestore.vcl.patch
-Patch68: openoffice.org-1.9.112.oooXXXXX.exception.package.patch
+Patch57: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
+Patch58: openoffice.org-1.9.121.rh127576.gnomeprintui.patch
+Patch59: openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
+Patch60: openoffice.org-1.9.121.ooo53026.selinux-pipegiveup.desktop.patch
+Patch61: openoffice.org-1.9.121.ooo52542.emptyrtfframes.sw.patch
+Patch62: openoffice.org-1.9.122.oooXXXXX.parallel.solenv.patch
+Patch63: openoffice.org-1.9.122.ooo52786.czech8bitdocimport.patch
+Patch64: openoffice.org-1.9.122.ooo52974.systemhsqldb.patch
+Patch65: openoffice.org-1.9.122.ooo52974.systembeanshell.patch
+Patch66: openoffice.org-1.9.122.ooo52626.workspacerestore.vcl.patch
+Patch67: openoffice.org-1.9.112.ooo53025.exception.package.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -836,24 +835,23 @@
%patch54 -p1 -b .ooo52048.inhalt.sw.patch
%patch55 -p1 -b .rh150643.fontconfigalwayssystemfont.vcl.patch
%patch56 -p1 -b .ooo49720.mozillanspr.extensions.patch
-%patch57 -p1 -b .workspace.cmcfixes12
-%patch58 -p1 -b .ooo52428.execshield.bridges.patch
+%patch57 -p1 -b .ooo52428.execshield.bridges.patch
%if %{build_fc5}
-%patch59 -p1 -b .rh127576.gnomeprintui.patch
+%patch58 -p1 -b .rh127576.gnomeprintui.patch
%endif
%if %{cripplemenus}
-%patch60 -p1 -b .rh156677.cripplemenus.sysui.patch
+%patch59 -p1 -b .rh156677.cripplemenus.sysui.patch
%endif
-%patch61 -p1 -b .rh164310.selinux-pipegiveup.desktop.patch
-%patch62 -p1 -b .ooo52542.emptyrtfframes.sw.patch
-%patch63 -p1 -b .oooXXXXX.parallel.solenv.patch
-%patch64 -p1 -b .ooo52786.czech8bitdocimport.patch
-%patch65 -p1 -b .ooo52974.systemhsqldb.patch
-%patch66 -p1 -b .ooo52974.systembeanshell.patch
+%patch60 -p1 -b .ooo53026.selinux-pipegiveup.desktop.patch
+%patch61 -p1 -b .ooo52542.emptyrtfframes.sw.patch
+%patch62 -p1 -b .oooXXXXX.parallel.solenv.patch
+%patch63 -p1 -b .ooo52786.czech8bitdocimport.patch
%if %{internaljavabits}
-%patch67 -p1 -b .ooo52626.workspacerestore.vcl.patch
-%patch68 -p1 -b .oooXXXXX.exception.package.patch
+%patch64 -p1 -b .ooo52974.systemhsqldb.patch
+%patch65 -p1 -b .ooo52974.systembeanshell.patch
%endif
+%patch66 -p1 -b .ooo52626.workspacerestore.vcl.patch
+%patch67 -p1 -b .ooo53025.exception.package.patch
%if %{includeexternals}
#start ludicrous workaround
@@ -917,6 +915,8 @@
unset USERNAME
#don't duplicate english helpcontent about the place
unset DEFAULT_TO_ENGLISH_FOR_PACKING
+#qadevOOo has some iso8859-16 but non utf-8 char sequences java chars
+export LANG=en_US.iso885915
%if %{usegcc3}
#this is needed for a mix of gcc/g++ 3.4.x and gcj/gij 4.0.x
@@ -3024,7 +3024,6 @@
%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_drawgraphics_types.xcu
%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_impressgraphics_types.xcu
-
%files xsltfilter
%defattr(-,root,root)
%dir %{instdir}
@@ -3101,8 +3100,9 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
-* Mon Aug 08 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.122-5
-- use system bsh
+* Mon Aug 08 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.123-1
+- use system beanshell
+- drop integrated workspace.cmcfixes12
* Fri Aug 05 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.122-4
- session management and workspace restore corrections
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- sources 2 Aug 2005 13:47:50 -0000 1.95
+++ sources 8 Aug 2005 14:58:29 -0000 1.96
@@ -3,4 +3,4 @@
6b3bd4b8eb31dd067d4cb2dcc1ba5e12 openoffice.org-myspell-contrib.tar.gz
11c0541fa373a327d1c134887ce511e7 openoffice.org-simple-crash_report.sh
c733528059f1ea2b51c78d07738bf121 gcj-sed.sh
-5c850386bd35526a14ddde50ffbb067d SRC680_m122.tar.bz2
+ac48445e2f4336b5d781d79c5cc856ad SRC680_m123.tar.bz2
--- openoffice.org-1.9.112.oooXXXXX.exception.package.patch DELETED ---
--- openoffice.org-1.9.121.rh164310.selinux-pipegiveup.desktop.patch DELETED ---
--- workspace.cmcfixes12 DELETED ---
- Previous message (by thread): rpms/gcc/devel gcc4-libffi-ppc-cfi.patch, NONE, 1.1 .cvsignore, 1.103, 1.104 gcc4-stack-protector.patch, 1.3, 1.4 gcc4.spec, 1.61, 1.62 sources, 1.105, 1.106 gcc4-fortran-equiv.patch, 1.1, NONE
- Next message (by thread): rpms/kdeaccessibility/devel .cvsignore, 1.5, 1.6 kdeaccessibility.spec, 1.6, 1.7 sources, 1.5, 1.6 admin-visibility.patch, 1.3, NONE kdeaccessibility-3.4.1-gcc4.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list