rpms/openoffice.org/devel openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch, 1.2, 1.3 openoffice.org.spec, 1.1232, 1.1233 openoffice.org-2.3.0.ooo77885.stoc.bootstrap.patch, 1.2, NONE openoffice.org-2.3.0.ooo77885.stoc.nonbootstrap.patch, 1.1, NONE
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Wed Aug 1 12:45:43 UTC 2007
- Previous message (by thread): rpms/openoffice.org/devel openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch, NONE, 1.1 openoffice.org.spec, 1.1231, 1.1232 openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch, 1.4, NONE
- Next message (by thread): rpms/bluez-libs/devel .cvsignore, 1.20, 1.21 bluez-libs.spec, 1.34, 1.35 sources, 1.20, 1.21
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31394
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch
Removed Files:
openoffice.org-2.3.0.ooo77885.stoc.bootstrap.patch
openoffice.org-2.3.0.ooo77885.stoc.nonbootstrap.patch
Log Message:
cat stocmerge stuff together
openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch
Index: openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch
===================================================================
RCS file: openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch
diff -N openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch 1 Aug 2007 12:45:40 -0000 1.3
@@ -0,0 +1,5006 @@
+Index: cli_ure/source/climaker/climaker_app.cxx
+===================================================================
+RCS file: /cvs/udk/cli_ure/source/climaker/climaker_app.cxx,v
+retrieving revision 1.13
+diff -u -r1.13 climaker_app.cxx
+--- cli_ure/source/climaker/climaker_app.cxx 5 Dec 2006 11:18:01 -0000 1.13
++++ cli_ure/source/climaker/climaker_app.cxx 29 May 2007 07:30:34 -0000
+@@ -481,7 +481,7 @@
+ // get rdb tdprovider factory
+ Reference< lang::XSingleComponentFactory > xTDprov_factory(
+ ::cppu::loadSharedLibComponentFactory(
+- OUSTR("regtypeprov.uno" SAL_DLLEXTENSION), OUString(),
++ OUSTR("bootstrap.uno" SAL_DLLEXTENSION), OUString(),
+ OUSTR("com.sun.star.comp.stoc.RegistryTypeDescriptionProvider"),
+ Reference< lang::XMultiServiceFactory >(
+ xContext->getServiceManager(), UNO_QUERY ),
+@@ -490,7 +490,7 @@
+ {
+ throw RuntimeException(
+ OUSTR("cannot get registry typedescription provider: "
+- "regtypeprov.uno" SAL_DLLEXTENSION "!"),
++ "bootstrap.uno" SAL_DLLEXTENSION "!"),
+ Reference< XInterface >() );
+ }
+
+Index: testtools/source/bridgetest/pyuno/main.py
+===================================================================
+RCS file: /cvs/udk/testtools/source/bridgetest/pyuno/main.py,v
+retrieving revision 1.3
+diff -u -r1.3 main.py
+--- testtools/source/bridgetest/pyuno/main.py 9 Sep 2005 12:26:52 -0000 1.3
++++ testtools/source/bridgetest/pyuno/main.py 29 May 2007 07:30:55 -0000
+@@ -42,7 +42,7 @@
+
+ ctx = uno.getComponentContext()
+ # needed for the tests
+-unohelper.addComponentsToContext(ctx,ctx,("cppobj.uno","bridgetest.uno","streams.uno","servicemgr.uno"),"com.sun.star.loader.SharedLibrary")
++unohelper.addComponentsToContext(ctx,ctx,("cppobj.uno","bridgetest.uno","streams.uno","bootstrap.uno"),"com.sun.star.loader.SharedLibrary")
+
+ unohelper.addComponentsToContext(ctx,ctx,("vnd.openoffice.pymodule:samplecomponent",),"com.sun.star.loader.Python")
+
+Index: xmlsecurity/tools/demo/makefile.mk
+===================================================================
+RCS file: /cvs/xml/xmlsecurity/tools/demo/makefile.mk,v
+retrieving revision 1.11
+diff -u -r1.11 makefile.mk
+--- xmlsecurity/tools/demo/makefile.mk 9 Mar 2007 08:44:43 -0000 1.11
++++ xmlsecurity/tools/demo/makefile.mk 29 May 2007 07:54:51 -0000
+@@ -146,10 +146,9 @@
+ $(JAVACLASSFILES) : $(JAVAFILES)
+
+ REGISTERLIBS= \
+- shlibloader.uno$(DLLPOST) \
+ dynamicloader.uno$(DLLPOST) \
+ namingservice.uno$(DLLPOST) \
+- servicemgr.uno$(DLLPOST) \
++ bootstrap.uno$(DLLPOST) \
+ sax.uno$(DLLPOST) \
+ $(DLLPRE)mozab2$(DLLPOST)
+
+Index: xmlsecurity/tools/standalone/csfit/util/makefile.mk
+===================================================================
+RCS file: /cvs/xml/xmlsecurity/tools/standalone/csfit/util/makefile.mk,v
+retrieving revision 1.3
+diff -u -r1.3 makefile.mk
+--- xmlsecurity/tools/standalone/csfit/util/makefile.mk 25 Jan 2007 13:24:45 -0000 1.3
++++ xmlsecurity/tools/standalone/csfit/util/makefile.mk 29 May 2007 07:30:58 -0000
+@@ -70,18 +70,12 @@
+ # Additional libraries
+ DLLPRE_NO=
+ REGISTERLIBS+= \
+- $(DLLPRE_NO)shlibloader.uno$(DLLPOST) \
+ $(DLLPRE_NO)dynamicloader.uno$(DLLPOST) \
+ $(DLLPRE_NO)namingservice.uno$(DLLPOST) \
+- $(DLLPRE_NO)servicemgr.uno$(DLLPOST) \
++ $(DLLPRE_NO)bootstrap.uno$(DLLPOST) \
+ $(DLLPRE)xsec_fw$(DLLPOST) \
+ $(DLLPRE)xsec_xmlsec$(DLLPOST)
+
+-# $(DLLPRE)implreg.uno$(DLLPOST) \
+-# $(DLLPRE)nestedreg.uno$(DLLPOST) \
+-# $(DLLPRE)simplereg.uno$(DLLPOST) \
+-
+-
+ .IF "$(GUI)" == "UNX"
+ MY_DLLDIR=$(SOLARLIBDIR)
+ REGISTERLIBS+= \
+Index: xmlsecurity/tools/standalone/mscsfit/util/makefile.mk
+===================================================================
+RCS file: /cvs/xml/xmlsecurity/tools/standalone/mscsfit/util/makefile.mk,v
+retrieving revision 1.3
+diff -u -r1.3 makefile.mk
+--- xmlsecurity/tools/standalone/mscsfit/util/makefile.mk 25 Jan 2007 13:24:58 -0000 1.3
++++ xmlsecurity/tools/standalone/mscsfit/util/makefile.mk 29 May 2007 07:30:58 -0000
+@@ -70,18 +70,12 @@
+ # Additional libraries
+ DLLPRE_NO=
+ REGISTERLIBS+= \
+- $(DLLPRE_NO)shlibloader.uno$(DLLPOST) \
+ $(DLLPRE_NO)dynamicloader.uno$(DLLPOST) \
+ $(DLLPRE_NO)namingservice.uno$(DLLPOST) \
+- $(DLLPRE_NO)servicemgr.uno$(DLLPOST) \
++ $(DLLPRE_NO)bootstrap.uno$(DLLPOST) \
+ $(DLLPRE)xsec_fw$(DLLPOST) \
+ $(DLLPRE)xsec_xmlsec$(DLLPOST)
+
+-# $(DLLPRE)implreg.uno$(DLLPOST) \
+-# $(DLLPRE)nestedreg.uno$(DLLPOST) \
+-# $(DLLPRE)simplereg.uno$(DLLPOST) \
+-
+-
+ .IF "$(GUI)" == "UNX"
+ MY_DLLDIR=$(SOLARLIBDIR)
+ REGISTERLIBS+= \
+diff -ruN stoc.orig/inc/bootstrapservices.hxx stoc/inc/bootstrapservices.hxx
+--- stoc.orig/inc/bootstrapservices.hxx 1970-01-01 01:00:00.000000000 +0100
++++ stoc/inc/bootstrapservices.hxx 2007-06-08 12:03:41.000000000 +0100
+@@ -0,0 +1,119 @@
++/*************************************************************************
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile$
++ *
++ * $Revision$
++ *
++ * last change: $Author$ $Date$
++ *
++ * The Contents of this file are made available subject to
++ * the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ * GNU Lesser General Public License Version 2.1
++ * =============================================
++ * Copyright 2005 by Sun Microsystems, Inc.
++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
++ ************************************************************************/
++
++// MARKER(update_precomp.py): autogen include statement, do not remove
++#include "precompiled_stoc.hxx"
++
++#include <rtl/ustring.hxx>
++#include <com/sun/star/uno/Sequence.hxx>
++#include <com/sun/star/uno/Reference.hxx>
++#include <com/sun/star/uno/RuntimeException.hpp>
++
++namespace com { namespace sun { namespace star { namespace uno {
++ class XInterface;
++ class XComponentContext;
++} } } }
++
++namespace stoc_bootstrap
++{
++ //servicemanager
++ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL OServiceManager_CreateInstance(
++ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext );
++ ::com::sun::star::uno::Sequence< ::rtl::OUString > smgr_wrapper_getSupportedServiceNames();
++ ::rtl::OUString smgr_wrapper_getImplementationName();
++ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL OServiceManagerWrapper_CreateInstance(
++ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext )
++ throw (::com::sun::star::uno::Exception);
++ ::com::sun::star::uno::Sequence< ::rtl::OUString > smgr_getSupportedServiceNames();
++ ::rtl::OUString smgr_getImplementationName();
++ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ORegistryServiceManager_CreateInstance(
++ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & xContext )
++ throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
++ ::com::sun::star::uno::Sequence< ::rtl::OUString > regsmgr_getSupportedServiceNames();
++ ::rtl::OUString regsmgr_getImplementationName();
++
++ //security
++ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ac_create(
++ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xComponentContext )
++ SAL_THROW( (::com::sun::star::uno::Exception) );
++ ::com::sun::star::uno::Sequence< ::rtl::OUString > ac_getSupportedServiceNames() SAL_THROW( () );
++ ::rtl::OUString ac_getImplementationName() SAL_THROW( () );
++
++ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL filepolicy_create(
++ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xComponentContext )
[...4613 lines suppressed...]
+-#
+-# $RCSfile$
+-#
+-# $Revision$
+-#
+-# last change: $Author$ $Date$
+-#
+-# The Contents of this file are made available subject to
+-# the terms of GNU Lesser General Public License Version 2.1.
+-#
+-#
+-# GNU Lesser General Public License Version 2.1
+-# =============================================
+-# Copyright 2005 by Sun Microsystems, Inc.
+-# 901 San Antonio Road, Palo Alto, CA 94303, USA
+-#
+-# This library is free software; you can redistribute it and/or
+-# modify it under the terms of the GNU Lesser General Public
+-# License version 2.1, as published by the Free Software Foundation.
+-#
+-# This library is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-# Lesser General Public License for more details.
+-#
+-# You should have received a copy of the GNU Lesser General Public
+-# License along with this library; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+-# MA 02111-1307 USA
+-#
+-#*************************************************************************
+-
+-UDK_3_0_0 {
+- global:
+- component_getFactory;
+- component_getImplementationEnvironment;
+- component_writeInfo;
+-
+- local:
+- *;
+-};
+diff -ruN stoc.orig/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
+--- stoc.orig/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx 2007-06-08 12:59:07.000000000 +0100
++++ stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx 2007-06-08 12:50:03.000000000 +0100
+@@ -36,7 +36,7 @@
+ // MARKER(update_precomp.py): autogen include statement, do not remove
+ #include "precompiled_stoc.hxx"
+
+-#include "VndSunStarPkgUrlReferenceFactory.hxx"
++#include "stocservices.hxx"
+
+ #include "supportsService.hxx"
+
+@@ -102,7 +102,7 @@
+ throw (css::uno::RuntimeException)
+ {
+ return
+- stoc::uriproc::VndSunStarPkgUrlReferenceFactory::
++ stoc_services::VndSunStarPkgUrlReferenceFactory::
+ getImplementationName();
+ }
+
+@@ -116,7 +116,7 @@
+ css::uno::Sequence< rtl::OUString > Factory::getSupportedServiceNames()
+ throw (css::uno::RuntimeException)
+ {
+- return stoc::uriproc::VndSunStarPkgUrlReferenceFactory::
++ return stoc_services::VndSunStarPkgUrlReferenceFactory::
+ getSupportedServiceNames();
+ }
+
+@@ -145,7 +145,7 @@
+
+ }
+
+-namespace stoc { namespace uriproc { namespace VndSunStarPkgUrlReferenceFactory
++namespace stoc_services { namespace VndSunStarPkgUrlReferenceFactory
+ {
+
+ css::uno::Reference< css::uno::XInterface > create(
+@@ -172,4 +172,4 @@
+ return s;
+ }
+
+-} } }
++} }
+diff -ruN stoc.orig/test/testconv.cxx stoc/test/testconv.cxx
+--- stoc.orig/test/testconv.cxx 2007-06-08 12:59:06.000000000 +0100
++++ stoc/test/testconv.cxx 2007-06-08 12:50:03.000000000 +0100
+@@ -692,7 +692,7 @@
+ OSL_ENSURE( xImplReg.is(), "### no impl reg!" );
+
+ OUString aLibName(
+- RTL_CONSTASCII_USTRINGPARAM("typeconverter.uno" SAL_DLLEXTENSION) );
++ RTL_CONSTASCII_USTRINGPARAM("stocservices.uno" SAL_DLLEXTENSION) );
+ xImplReg->registerImplementation(
+ OUString::createFromAscii("com.sun.star.loader.SharedLibrary"),
+ aLibName, Reference< XSimpleRegistry >() );
+diff -ruN stoc.orig/test/testiadapter.cxx stoc/test/testiadapter.cxx
+--- stoc.orig/test/testiadapter.cxx 2007-06-08 12:59:06.000000000 +0100
++++ stoc/test/testiadapter.cxx 2007-06-08 12:50:03.000000000 +0100
+@@ -1040,7 +1040,7 @@
+ Reference< XSimpleRegistry >() );
+ xImplReg->registerImplementation(
+ OUString::createFromAscii("com.sun.star.loader.SharedLibrary"),
+- OUString::createFromAscii("typeconverter.uno" SAL_DLLEXTENSION),
++ OUString::createFromAscii("stocservices.uno" SAL_DLLEXTENSION),
+ Reference< XSimpleRegistry >() );
+ xImplReg->registerImplementation(
+ OUString::createFromAscii("com.sun.star.loader.SharedLibrary"),
+diff -ruN stoc.orig/test/uriproc/makefile.mk stoc/test/uriproc/makefile.mk
+--- stoc.orig/test/uriproc/makefile.mk 2007-06-08 12:59:06.000000000 +0100
++++ stoc/test/uriproc/makefile.mk 2007-06-08 12:57:41.000000000 +0100
+@@ -72,7 +72,7 @@
+
+ $(BIN)$/$(TARGET).rdb .ERRREMOVE:
+ + $(COPY) $(SOLARBINDIR)$/types.rdb $@
+- regcomp -register -r $@ -c $(subst,$/,/ $(DLLDEST)$/uriproc.uno$(DLLPOST))
++ regcomp -register -r $@ -c $(subst,$/,/ $(DLLDEST)$/stocservices.uno$(DLLPOST))
+
+ test .PHONY: $(SHL1TARGETN) $(BIN)$/$(TARGET).rdb
+ testshl2 $(SHL1TARGETN) -forward $(BIN)$/$(TARGET).rdb
+diff -ruN stoc.orig/util/makefile.mk stoc/util/makefile.mk
+--- stoc.orig/util/makefile.mk 2007-06-08 12:59:07.000000000 +0100
++++ stoc/util/makefile.mk 2007-06-08 12:50:03.000000000 +0100
+@@ -74,6 +74,28 @@
+
+ DEF1NAME= $(SHL1TARGET)
+
++SHL2TARGET= stocservices.uno
++
++LIB2TARGET= $(SLB)$/stocservices.uno.lib
++LIB2FILES= \
++ $(SLB)$/stocservices.lib \
++ $(SLB)$/typeconverter.lib \
++ $(SLB)$/uriproc.lib
++
++SHL2VERSIONMAP = stocservices.map
++
++SHL2STDLIBS= \
++ $(CPPULIB) \
++ $(CPPUHELPERLIB) \
++ $(SALLIB)
++
++SHL2DEPN=
++SHL2IMPLIB= istocservices.uno
++SHL2LIBS= $(SLB)$/stocservices.uno.lib
++SHL2DEF= $(MISC)$/$(SHL2TARGET).def
++
++DEF2NAME= $(SHL2TARGET)
++
+ # --- Targets ------------------------------------------------------
+
+ .INCLUDE : target.mk
+diff -ruN stoc.orig/util/stocservices.map stoc/util/stocservices.map
+--- stoc.orig/util/stocservices.map 1970-01-01 01:00:00.000000000 +0100
++++ stoc/util/stocservices.map 2007-06-08 12:50:03.000000000 +0100
+@@ -0,0 +1,10 @@
++UDK_3_0_0 {
++ global:
++ component_getImplementationEnvironment;
++ component_writeInfo;
++ component_getFactory;
++ component_canUnload;
++ component_getDescriptionFunc;
++ local:
++ *;
++};
+diff -ruN instsetoo_native.orig/util/makefile.mk instsetoo_native/util/makefile.mk
+--- instsetoo_native.orig/util/makefile.mk 2007-06-08 13:01:42.000000000 +0100
++++ instsetoo_native/util/makefile.mk 2007-06-08 12:51:14.000000000 +0100
+@@ -434,10 +434,7 @@
+ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/textoutstream.uno$(DLLPOST)$(MY_Q) \
+ -env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ + $(REGCOMP) -register -r $@ -c \
+- $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/typeconverter.uno$(DLLPOST)$(MY_Q) \
+- -env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+- + $(REGCOMP) -register -r $@ -c \
+- $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/uriproc.uno$(DLLPOST)$(MY_Q) \
++ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/stocservices.uno$(DLLPOST)$(MY_Q) \
+ -env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ + $(REGCOMP) -register -r $@ -c \
+ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/uuresolver.uno$(DLLPOST)$(MY_Q) \
+diff -ruN bridges.orig/test/java_uno/nativethreadpool/makefile.mk bridges/test/java_uno/nativethreadpool/makefile.mk
+--- bridges.orig/test/java_uno/nativethreadpool/makefile.mk 2007-06-08 13:02:59.000000000 +0100
++++ bridges/test/java_uno/nativethreadpool/makefile.mk 2007-06-08 12:50:45.000000000 +0100
+@@ -100,11 +100,11 @@
+ -c bridgefac.uno$(DLLPOST) -c connector.uno$(DLLPOST) \
+ -c remotebridge.uno$(DLLPOST) -c uuresolver.uno$(DLLPOST) \
+ -c javaloader.uno$(DLLPOST) -c javavm.uno$(DLLPOST) \
+- -c uriproc.uno$(DLLPOST)
++ -c stocservices.uno$(DLLPOST)
+ cp $(SOLARBINDIR)$/types.rdb $(MISC)$/$(TARGET)$/bootstrap.rdb
+ regcomp -register -r $(MISC)$/$(TARGET)$/bootstrap.rdb \
+ -c javaloader.uno$(DLLPOST) -c javavm.uno$(DLLPOST) \
+- -c uriproc.uno$(DLLPOST)
++ -c stocservices.uno$(DLLPOST)
+ .IF "$(GUI)" == "WNT"
+ ERROR -- missing platform
+ .ELSE # GUI, WNT
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1232
retrieving revision 1.1233
diff -u -r1.1232 -r1.1233
--- openoffice.org.spec 1 Aug 2007 12:15:17 -0000 1.1232
+++ openoffice.org.spec 1 Aug 2007 12:45:40 -0000 1.1233
@@ -138,21 +138,20 @@
Patch73: workspace.cmcfixes34.patch
Patch74: openoffice.org-2.2.0.ooo77470.docexport.liberation.to.ms.patch
Patch75: openoffice.org-2.2.1.ooo73728.desktop.mapped_type.patch
-Patch76: openoffice.org-2.3.0.ooo77885.stoc.bootstrap.patch
-Patch77: openoffice.org-2.3.0.ooo77885.stoc.nonbootstrap.patch
-Patch78: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
-Patch79: openoffice.org-2.2.1.ooo78198.sixtyfour.svx.patch
-Patch80: openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch
-Patch81: openoffice.org-2.2.1.ooo78392.sixtyfour.tools.patch
-Patch82: openoffice.org-2.2.1.oooXXXXX.xmloff.outofrange.patch
-Patch83: workspace.glyphadv.patch
-Patch84: openoffice.org-2.2.1.ooo78921.sw.embedded.patch
-Patch85: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
-Patch86: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
-Patch87: openoffice.org.ooo79953.dbusinhibitscreensaver.patch
-Patch88: openoffice.org-2.2.1.ooo79878.vcl.honourwidthtype.patch
-Patch89: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
-Patch90: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
+Patch76: openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch
+Patch77: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
+Patch78: openoffice.org-2.2.1.ooo78198.sixtyfour.svx.patch
+Patch79: openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch
+Patch80: openoffice.org-2.2.1.ooo78392.sixtyfour.tools.patch
+Patch81: openoffice.org-2.2.1.oooXXXXX.xmloff.outofrange.patch
+Patch82: workspace.glyphadv.patch
+Patch83: openoffice.org-2.2.1.ooo78921.sw.embedded.patch
+Patch84: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
+Patch85: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
+Patch86: openoffice.org.ooo79953.dbusinhibitscreensaver.patch
+Patch87: openoffice.org-2.2.1.ooo79878.vcl.honourwidthtype.patch
+Patch88: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
+Patch89: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
%define instdir %{_libdir}/openoffice.org
@@ -1084,22 +1083,21 @@
%patch74 -p1 -b .ooo77470.docexport.liberation.to.ms.patch
%patch75 -p1 -b .ooo73728.desktop.mapped_type.patch
%if %{linkopt}
-%patch76 -p0 -b .ooo77885.stoc.bootstrap.patch
-%patch77 -p0 -b .ooo77885.stoc.nonbootstrap.patch
+%patch76 -p0 -b .ooo77885.stoc.stocmerge.patch
%endif
-%patch78 -p1 -b .oooXXXXX.selinux.bridges.patch
-%patch79 -p1 -b .ooo78198.sixtyfour.svx.patch
-%patch80 -p1 -b .ooo78383.vcl.printxerror.patch
-%patch81 -p1 -b .ooo78392.sixtyfour.tools.patch
-%patch82 -p1 -b .oooXXXXX.xmloff.outofrange.patch
-%patch83 -p1 -b .workspace.glyphadv.patch
-%patch84 -p1 -b .ooo78921.sw.embedded.patch
-%patch85 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
-%patch86 -p1 -b .ooo79481.sw.rowordcount.patch
-%patch87 -p1 -b .ooo79953.dbusinhibitscreensaver.patch
-%patch88 -p1 -b .ooo79878.vcl.honourwidthtype.patch
-%patch89 -p1 -b .ooo80257.sd.textonlystyle.patch
-tar xzf %{PATCH90}
+%patch77 -p1 -b .oooXXXXX.selinux.bridges.patch
+%patch78 -p1 -b .ooo78198.sixtyfour.svx.patch
+%patch79 -p1 -b .ooo78383.vcl.printxerror.patch
+%patch80 -p1 -b .ooo78392.sixtyfour.tools.patch
+%patch81 -p1 -b .oooXXXXX.xmloff.outofrange.patch
+%patch82 -p1 -b .workspace.glyphadv.patch
+%patch83 -p1 -b .ooo78921.sw.embedded.patch
+%patch84 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
+%patch85 -p1 -b .ooo79481.sw.rowordcount.patch
+%patch86 -p1 -b .ooo79953.dbusinhibitscreensaver.patch
+%patch87 -p1 -b .ooo79878.vcl.honourwidthtype.patch
+%patch88 -p1 -b .ooo80257.sd.textonlystyle.patch
+tar xzf %{PATCH89}
%if %{linkopt}
chmod a+x solenv/bin/mklinkscript.pl
--- openoffice.org-2.3.0.ooo77885.stoc.bootstrap.patch DELETED ---
--- openoffice.org-2.3.0.ooo77885.stoc.nonbootstrap.patch DELETED ---
- Previous message (by thread): rpms/openoffice.org/devel openoffice.org-1.9.130.ooo67740.doublefree.xmlhelp.patch, NONE, 1.1 openoffice.org.spec, 1.1231, 1.1232 openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch, 1.4, NONE
- Next message (by thread): rpms/bluez-libs/devel .cvsignore, 1.20, 1.21 bluez-libs.spec, 1.34, 1.35 sources, 1.20, 1.21
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list