rpms/openoffice.org/devel openoffice.org-2.3.0.ooo77885.stoc.bootstrap.patch, NONE, 1.1 openoffice.org.spec, 1.1200, 1.1201 openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch, 1.1, NONE
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Fri Jun 8 10:46:14 UTC 2007
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5874
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-2.3.0.ooo77885.stoc.bootstrap.patch
Removed Files:
openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch
Log Message:
update stocmerge patch
openoffice.org-2.3.0.ooo77885.stoc.bootstrap.patch:
--- NEW FILE openoffice.org-2.3.0.ooo77885.stoc.bootstrap.patch ---
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 )
+ SAL_THROW( (Exception) );
+ ::com::sun::star::uno::Sequence< rtl::OUString > filepolicy_getSupportedServiceNames() SAL_THROW( () );
+ ::rtl::OUString filepolicy_getImplementationName() SAL_THROW( () );
+
+ //defaultregistry
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL NestedRegistry_CreateInstance(
[...3302 lines suppressed...]
- gid_File_Lib_Defreg,
+ gid_File_Lib_Bootstrap,
gid_File_Lib_Corefl,
- gid_File_Lib_Cpld,
gid_File_Lib_Adabas_2,
gid_File_Lib_Cached1,
gid_File_Lib_Curl,
@@ -304,7 +303,6 @@
gid_File_Lib_Localedata_Es,
gid_File_Lib_Localedata_Euro,
gid_File_Lib_Localedata_Others,
- gid_File_Lib_Impreg,
gid_File_Lib_Insp,
gid_File_Lib_Inv,
gid_File_Lib_Invadp,
@@ -343,11 +341,7 @@
gid_File_Lib_Sal,
gid_File_Lib_Salhelper,
gid_File_Lib_Proxyfac,
- gid_File_Lib_Rdbtdp,
gid_File_Lib_Sax,
- gid_File_Lib_Sec,
- gid_File_Lib_Smgr,
- gid_File_Lib_Simreg,
gid_File_Lib_Slideshow,
gid_File_Lib_Stm,
gid_File_Lib_Recentfile,
@@ -369,7 +363,6 @@
gid_File_Lib_Tinstrm,
gid_File_Lib_Toutstrm,
gid_File_Lib_Tcv,
- gid_File_Lib_Tdmgr,
gid_File_Ucptdoc1,
gid_File_Ucpexpand1,
gid_File_Lib_Uriproc,
diff -ruN instsetoo_native.orig/util/makefile.mk instsetoo_native/util/makefile.mk
--- instsetoo_native.orig/util/makefile.mk 2007-06-08 12:17:56.000000000 +0100
+++ instsetoo_native/util/makefile.mk 2007-06-08 12:07:03.000000000 +0100
@@ -393,7 +393,7 @@
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/connector.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/implreg.uno$(DLLPOST)$(MY_Q) \
+ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/bootstrap.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/introspection.uno$(DLLPOST)$(MY_Q) \
@@ -416,33 +416,15 @@
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/namingservice.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/nestedreg.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/proxyfac.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/reflection.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/regtypeprov.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/remotebridge.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/security.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/servicemgr.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/shlibloader.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/simplereg.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/streams.uno$(DLLPOST)$(MY_Q) \
-env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ $(REGCOMP) -register -r $@ -c \
@@ -455,9 +437,6 @@
$(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/typemgr.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) \
-env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ $(REGCOMP) -register -r $@ -c \
diff -ruN cppuhelper.orig/source/bootstrap.cxx cppuhelper/source/bootstrap.cxx
--- cppuhelper.orig/source/bootstrap.cxx 2007-06-08 12:19:25.000000000 +0100
+++ cppuhelper/source/bootstrap.cxx 2007-06-08 12:03:41.000000000 +0100
@@ -398,7 +398,7 @@
Reference<registry::XRegistryKey> xEmptyKey;
Reference<lang::XSingleServiceFactory> xSimRegFac(
loadSharedLibComponentFactory(
- OUSTR("simplereg.uno" SAL_DLLEXTENSION), bootstrapPath,
+ OUSTR("bootstrap.uno" SAL_DLLEXTENSION), bootstrapPath,
OUSTR("com.sun.star.comp.stoc.SimpleRegistry"),
smgr_XMultiServiceFactory,
xEmptyKey),
@@ -406,7 +406,7 @@
Reference<lang::XSingleServiceFactory> xNesRegFac(
loadSharedLibComponentFactory(
- OUSTR("nestedreg.uno" SAL_DLLEXTENSION), bootstrapPath,
+ OUSTR("bootstrap.uno" SAL_DLLEXTENSION), bootstrapPath,
OUSTR("com.sun.star.comp.stoc.NestedRegistry"),
smgr_XMultiServiceFactory,
xEmptyKey),
diff -ruN cppuhelper.orig/source/servicefactory.cxx cppuhelper/source/servicefactory.cxx
--- cppuhelper.orig/source/servicefactory.cxx 2007-06-08 12:19:25.000000000 +0100
+++ cppuhelper/source/servicefactory.cxx 2007-06-08 12:03:41.000000000 +0100
@@ -126,7 +126,7 @@
return Reference< registry::XSimpleRegistry >(
createInstance(
loadSharedLibComponentFactory(
- OUSTR("simplereg.uno" SAL_DLLEXTENSION),
+ OUSTR("bootstrap.uno" SAL_DLLEXTENSION),
0 == rBootstrapPath.getLength()
? get_this_libpath() : rBootstrapPath,
OUSTR("com.sun.star.comp.stoc.SimpleRegistry"),
@@ -157,7 +157,7 @@
return Reference< registry::XSimpleRegistry >(
createInstance(
loadSharedLibComponentFactory(
- OUSTR("nestedreg.uno" SAL_DLLEXTENSION),
+ OUSTR("bootstrap.uno" SAL_DLLEXTENSION),
0 == rBootstrapPath.getLength()
? get_this_libpath() : rBootstrapPath,
OUSTR("com.sun.star.comp.stoc.NestedRegistry"),
@@ -340,7 +340,7 @@
Reference< lang::XMultiComponentFactory > xMgr(
createInstance(
loadSharedLibComponentFactory(
- OUSTR("servicemgr.uno" SAL_DLLEXTENSION), bootstrap_path,
+ OUSTR("bootstrap.uno" SAL_DLLEXTENSION), bootstrap_path,
OUSTR("com.sun.star.comp.stoc.ORegistryServiceManager"),
Reference< lang::XMultiServiceFactory >(),
Reference< registry::XRegistryKey >() ) ),
@@ -348,21 +348,21 @@
// add initial bootstrap services
static char const * ar[] = {
- "servicemgr.uno" SAL_DLLEXTENSION,
+ "bootstrap.uno" SAL_DLLEXTENSION,
"com.sun.star.comp.stoc.OServiceManagerWrapper",
- "shlibloader.uno" SAL_DLLEXTENSION,
+ "bootstrap.uno" SAL_DLLEXTENSION,
"com.sun.star.comp.stoc.DLLComponentLoader",
- "simplereg.uno" SAL_DLLEXTENSION,
+ "bootstrap.uno" SAL_DLLEXTENSION,
"com.sun.star.comp.stoc.SimpleRegistry",
- "nestedreg.uno" SAL_DLLEXTENSION,
+ "bootstrap.uno" SAL_DLLEXTENSION,
"com.sun.star.comp.stoc.NestedRegistry",
- "typemgr.uno" SAL_DLLEXTENSION,
+ "bootstrap.uno" SAL_DLLEXTENSION,
"com.sun.star.comp.stoc.TypeDescriptionManager",
- "implreg.uno" SAL_DLLEXTENSION,
+ "bootstrap.uno" SAL_DLLEXTENSION,
"com.sun.star.comp.stoc.ImplementationRegistration",
- "security.uno" SAL_DLLEXTENSION,
+ "bootstrap.uno" SAL_DLLEXTENSION,
"com.sun.star.security.comp.stoc.AccessController",
- "security.uno" SAL_DLLEXTENSION,
+ "bootstrap.uno" SAL_DLLEXTENSION,
"com.sun.star.security.comp.stoc.FilePolicy",
0
};
@@ -498,7 +498,7 @@
// add registry td provider factory to smgr and instance to tdmgr
Reference< lang::XSingleComponentFactory > xFac(
loadSharedLibComponentFactory(
- OUSTR("regtypeprov.uno" SAL_DLLEXTENSION),
+ OUSTR("bootstrap.uno" SAL_DLLEXTENSION),
0 == rBootstrapPath.getLength()
? get_this_libpath() : rBootstrapPath,
OUSTR("com.sun.star.comp.stoc.RegistryTypeDescriptionProvider"),
diff -ruN cppuhelper.orig/test/makefile.mk cppuhelper/test/makefile.mk
--- cppuhelper.orig/test/makefile.mk 2007-06-08 12:19:25.000000000 +0100
+++ cppuhelper/test/makefile.mk 2007-06-08 12:04:53.000000000 +0100
@@ -152,14 +152,7 @@
+regmerge $@ / $(UNOUCRRDB)
+regcomp -register -r $@ -c reflection.uno$(DLLPOST)
touch $@
- +$(COPY) $(UNO_PATH)$/servicemgr.uno* $(UNO_OUT)
- +$(COPY) $(UNO_PATH)$/shlibloader.uno* $(UNO_OUT)
- +$(COPY) $(UNO_PATH)$/simplereg.uno* $(UNO_OUT)
- +$(COPY) $(UNO_PATH)$/nestedreg.uno* $(UNO_OUT)
- +$(COPY) $(UNO_PATH)$/typemgr.uno* $(UNO_OUT)
- +$(COPY) $(UNO_PATH)$/regtypeprov.uno* $(UNO_OUT)
- +$(COPY) $(UNO_PATH)$/implreg.uno* $(UNO_OUT)
- +$(COPY) $(UNO_PATH)$/security.uno* $(UNO_OUT)
+ +$(COPY) $(UNO_PATH)$/bootstrap.uno* $(UNO_OUT)
unoheader: $(BIN)$/cpputest.rdb
+cppumaker $(CPPUMAKERFLAGS) -BUCR -O$(UNOUCROUT) -T"$(TYPES);$(HELPERTYPES)" $(BIN)$/cpputest.rdb
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1200
retrieving revision 1.1201
diff -u -r1.1200 -r1.1201
--- openoffice.org.spec 7 Jun 2007 16:39:23 -0000 1.1200
+++ openoffice.org.spec 8 Jun 2007 10:45:40 -0000 1.1201
@@ -139,7 +139,7 @@
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.stocmerge.patch
+Patch76: openoffice.org-2.3.0.ooo77885.stoc.bootstrap.patch
Patch77: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
Patch78: openoffice.org-2.2.1.ooo78198.sixtyfour.svx.patch
@@ -1076,7 +1076,7 @@
%patch74 -p1 -b .ooo77470.docexport.liberation.to.ms.patch
%patch75 -p1 -b .ooo73728.desktop.mapped_type.patch
%if %{linkopt}
-%patch76 -p0 -b .ooo77885.stoc.stocmerge.patch
+%patch76 -p0 -b .ooo77885.stoc.bootstrap.patch
%endif
%patch77 -p1 -b .oooXXXXX.selinux.bridges.patch
%patch78 -p1 -b .ooo78198.sixtyfour.svx.patch
@@ -2677,6 +2677,7 @@
in drawing objects ooo#72349
- add workspace.ppc64.patch
- extend selinux patch for ppc64 and sparc
+- update stocmerge patch
* Thu May 31 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-18.1
- next 2.2.1 release candidate
--- openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch DELETED ---
More information about the fedora-extras-commits
mailing list