rpms/openoffice.org/devel openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch, NONE, 1.1 openoffice.org.spec, 1.1187, 1.1188
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Wed May 30 17:14:02 UTC 2007
- Previous message (by thread): rpms/gnu-smalltalk/devel gst-2.3.4-am.patch, NONE, 1.1 gst-2.3.4-gdbm.patch, NONE, 1.1 gst-2.3.4-geo.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 gnu-smalltalk.spec, 1.14, 1.15 sources, 1.5, 1.6 gst-2.3.3-am.patch, 1.1, NONE gst-2.3.3-path.patch, 1.1, NONE gst-2.3.3-pub.patch, 1.1, NONE
- Next message (by thread): rpms/mash/devel .cvsignore, 1.3, 1.4 mash.spec, 1.2, 1.3 sources, 1.3, 1.4
- 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-serv4750
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch
Log Message:
the fruits of Jan's merge
openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch:
--- NEW FILE openoffice.org-2.3.0.ooo77885.stoc.stocmerge.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: cppuhelper/source/bootstrap.cxx
===================================================================
RCS file: /cvs/udk/cppuhelper/source/bootstrap.cxx,v
retrieving revision 1.28
diff -u -r1.28 bootstrap.cxx
--- cppuhelper/source/bootstrap.cxx 1 Dec 2006 17:18:20 -0000 1.28
+++ cppuhelper/source/bootstrap.cxx 29 May 2007 07:30:34 -0000
@@ -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),
Index: cppuhelper/source/servicefactory.cxx
===================================================================
RCS file: /cvs/udk/cppuhelper/source/servicefactory.cxx,v
retrieving revision 1.39
diff -u -r1.39 servicefactory.cxx
--- cppuhelper/source/servicefactory.cxx 16 Sep 2006 12:42:17 -0000 1.39
+++ cppuhelper/source/servicefactory.cxx 29 May 2007 07:30:34 -0000
@@ -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"),
Index: cppuhelper/test/makefile.mk
===================================================================
RCS file: /cvs/udk/cppuhelper/test/makefile.mk,v
retrieving revision 1.22
diff -u -r1.22 makefile.mk
--- cppuhelper/test/makefile.mk 25 Jan 2007 12:07:51 -0000 1.22
+++ cppuhelper/test/makefile.mk 29 May 2007 07:30:34 -0000
@@ -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: instsetoo_native/util/makefile.mk
===================================================================
RCS file: /cvs/installation/instsetoo_native/util/makefile.mk,v
retrieving revision 1.66
diff -u -r1.66 makefile.mk
--- instsetoo_native/util/makefile.mk 1 Mar 2007 15:58:43 -0000 1.66
+++ instsetoo_native/util/makefile.mk 29 May 2007 07:30:39 -0000
@@ -387,13 +387,13 @@
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/acceptor.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/bridgefac.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/connector.uno$(DLLPOST)$(MY_Q) \
+ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/bridgefac.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/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/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) \
[...3426 lines suppressed...]
- <type> com.sun.star.lang.XComponent </type>
- <type> com.sun.star.lang.XEventListener </type>
- <type> com.sun.star.lang.XInitialization </type>
- <type> com.sun.star.lang.XTypeProvider </type>
- <type> com.sun.star.lang.XServiceInfo </type>
- <type> com.sun.star.lang.XSingleServiceFactory </type>
- <type> com.sun.star.lang.XSingleComponentFactory </type>
- <type> com.sun.star.lang.XMultiServiceFactory </type>
- <type> com.sun.star.lang.DisposedException </type>
- <type> com.sun.star.registry.XSimpleRegistry </type>
- <type> com.sun.star.beans.XPropertySet </type>
- <type> com.sun.star.container.XSet </type>
- <type> com.sun.star.container.XEnumeration </type>
- <type> com.sun.star.container.XContentEnumerationAccess </type>
- <type> com.sun.star.container.XHierarchicalNameAccess </type>
- <type> com.sun.star.uno.XComponentContext </type>
- <type> com.sun.star.uno.XAggregation </type>
- <type> com.sun.star.uno.XWeak </type>
- <type> com.sun.star.uno.TypeClass </type>
- <type> com.sun.star.uno.XUnloadingPreference </type>
- <type> com.sun.star.beans.PropertyAttribute </type>
- </component-description>
- <project-build-dependency> cppuhelper </project-build-dependency>
- <project-build-dependency> cppu </project-build-dependency>
- <project-build-dependency> sal </project-build-dependency>
- <runtime-module-dependency> cppuhelper3$(COM) </runtime-module-dependency>
- <runtime-module-dependency> cppu3 </runtime-module-dependency>
- <runtime-module-dependency> sal3 </runtime-module-dependency>
-</module-description>
diff -ruN stoc/source/simpleregistry/simreg.map SRC680_m211/stoc/source/simpleregistry/simreg.map
--- stoc/source/simpleregistry/simreg.map 2001-06-22 18:21:01.000000000 +0200
+++ stoc/source/simpleregistry/simreg.map 1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
- global:
- component_getImplementationEnvironment;
- component_writeInfo;
- component_getFactory;
- component_canUnload;
- component_getDescriptionFunc;
- local:
- *;
-};
diff -ruN stoc/source/simpleregistry/simreg.xml SRC680_m211/stoc/source/simpleregistry/simreg.xml
--- stoc/source/simpleregistry/simreg.xml 2003-04-23 18:13:12.000000000 +0200
+++ stoc/source/simpleregistry/simreg.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
-<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
- <module-name> simplereg.uno </module-name>
- <component-description>
- <author> Juergen Schmidt </author>
- <name> com.sun.star.comp.stoc.SimpleRegistry </name>
- <description>
- This component provides access to a simple hierachical registry. The registry based on
- one registry file.
-</description>
- <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
- <language> c++ </language>
- <status value="final"/>
- <supported-service> com.sun.star.registry.SimpleRegistry </supported-service>
- <type> com.sun.star.lang.XTypeProvider </type>
- <type> com.sun.star.lang.XServiceInfo </type>
- <type> com.sun.star.lang.XSingleServiceFactory </type>
- <type> com.sun.star.lang.XSingleComponentFactory </type>
- <type> com.sun.star.lang.XMultiServiceFactory </type>
- <type> com.sun.star.lang.XMultiComponentFactory </type>
- <type> com.sun.star.registry.XSimpleRegistry </type>
- <type> com.sun.star.registry.XRegistryKey </type>
- <type> com.sun.star.uno.XAggregation </type>
- <type> com.sun.star.uno.XWeak </type>
- <type> com.sun.star.uno.TypeClass </type>
- <type> com.sun.star.uno.XComponentContext </type>
- </component-description>
- <project-build-dependency> cppuhelper </project-build-dependency>
- <project-build-dependency> cppu </project-build-dependency>
- <project-build-dependency> registry </project-build-dependency>
- <project-build-dependency> store </project-build-dependency>
- <project-build-dependency> salhelper </project-build-dependency>
- <project-build-dependency> sal </project-build-dependency>
- <runtime-module-dependency> cppuhelper2$(COM) </runtime-module-dependency>
- <runtime-module-dependency> cppu2 </runtime-module-dependency>
- <runtime-module-dependency> reg2 </runtime-module-dependency>
- <runtime-module-dependency> store2 </runtime-module-dependency>
- <runtime-module-dependency> salhelper2$(COM) </runtime-module-dependency>
- <runtime-module-dependency> sal2 </runtime-module-dependency>
-</module-description>
diff -ruN stoc/source/tdmanager/tdmgr.map SRC680_m211/stoc/source/tdmanager/tdmgr.map
--- stoc/source/tdmanager/tdmgr.map 2001-06-22 18:21:01.000000000 +0200
+++ stoc/source/tdmanager/tdmgr.map 1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
- global:
- component_getImplementationEnvironment;
- component_writeInfo;
- component_getFactory;
- component_canUnload;
- component_getDescriptionFunc;
- local:
- *;
-};
diff -ruN stoc/util/bootstrap.map stoc/util/bootstrap.map
--- stoc/util/bootstrap.map 1970-01-01 01:00:00.000000000 +0100
+++ stoc/util/bootstrap.map 2007-05-25 13:17:33.000000000 +0200
@@ -0,0 +1,10 @@
+UDK_3_0_0 {
+ global:
+ component_getImplementationEnvironment;
+ component_writeInfo;
+ component_getFactory;
+ component_canUnload;
+ component_getDescriptionFunc;
+ local:
+ *;
+};
diff -ruN stoc/util/makefile.mk stoc/util/makefile.mk
--- stoc/util/makefile.mk 1970-01-01 01:00:00.000000000 +0100
+++ stoc/util/makefile.mk 2007-05-28 17:09:13.000000000 +0200
@@ -0,0 +1,80 @@
+#*************************************************************************
+#
+# 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
+#
+#*************************************************************************
+PRJ=..
+
+PRJNAME= bootstrap
+TARGET = bootstrap.uno
+ENABLE_EXCEPTIONS=TRUE
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+DLLPRE =
+
+# ------------------------------------------------------------------
+
+SHL1TARGET= $(TARGET)
+
+LIB1TARGET= $(SLB)$/$(TARGET).lib
+LIB1FILES= $(SLB)$/bootstrap.lib \
+ $(SLB)$/security.lib \
+ $(SLB)$/servicemgr.lib \
+ $(SLB)$/simplereg.lib \
+ $(SLB)$/nestedreg.lib \
+ $(SLB)$/implreg.lib \
+ $(SLB)$/shlibloader.lib \
+ $(SLB)$/regtypeprov.lib \
+ $(SLB)$/typemgr.lib
+
+SHL1VERSIONMAP = bootstrap.map
+
+SHL1STDLIBS= \
+ $(CPPULIB) \
+ $(SALHELPERLIB) \
+ $(CPPUHELPERLIB) \
+ $(SALLIB) \
+ $(REGLIB)
+
+SHL1DEPN=
+SHL1IMPLIB= i$(TARGET)
+SHL1LIBS= $(SLB)$/$(TARGET).lib
+SHL1DEF= $(MISC)$/$(SHL1TARGET).def
+
+DEF1NAME= $(SHL1TARGET)
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : target.mk
+
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1187
retrieving revision 1.1188
diff -u -r1.1187 -r1.1188
--- openoffice.org.spec 24 May 2007 13:47:32 -0000 1.1187
+++ openoffice.org.spec 30 May 2007 17:13:28 -0000 1.1188
@@ -139,6 +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
%define instdir %{_libdir}/openoffice.org
@@ -1072,6 +1073,9 @@
%patch73 -p1 -b .workspace.cmcfixes34.patch
%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
+%endif
cp %{SOURCE1} extras/source/database/evolocal.odb
@@ -1611,7 +1615,6 @@
%{instdir}/program/gnome-open-url.bin
%{instdir}/program/hatchwindowfactory.uno.so
%{instdir}/program/i18nsearch.uno.so
-%{instdir}/program/implreg.uno.so
%{instdir}/program/intro.bmp
%{instdir}/program/introspection.uno.so
%{instdir}/program/invocadapt.uno.so
@@ -1789,7 +1792,6 @@
%{instdir}/program/libxstor.so
%{instdir}/program/migrationoo2.uno.so
%{instdir}/program/namingservice.uno.so
-%{instdir}/program/nestedreg.uno.so
%{instdir}/program/nsplugin
%{instdir}/program/open-url
%{instdir}/program/passwordcontainer.uno.so
@@ -1800,7 +1802,6 @@
%{instdir}/program/productregistration.uno.so
%{instdir}/program/proxyfac.uno.so
%{instdir}/program/reflection.uno.so
-%{instdir}/program/regtypeprov.uno.so
%{instdir}/program/remotebridge.uno.so
%dir %{instdir}/program/resource
%{instdir}/program/resource/avmedia680en-US.res
@@ -1862,13 +1863,9 @@
%{instdir}/program/resource/xmlsec680en-US.res
%{instdir}/program/resource/xsltdlg680en-US.res
%{instdir}/program/sax.uno.so
-%{instdir}/program/security.uno.so
%{instdir}/program/senddoc
-%{instdir}/program/servicemgr.uno.so
%{instdir}/program/services.rdb
%{instdir}/program/setuprc
-%{instdir}/program/shlibloader.uno.so
-%{instdir}/program/simplereg.uno.so
%{instdir}/program/slideshow.uno.so
%{instdir}/program/setofficelang*
%{instdir}/program/soffice
@@ -1885,7 +1882,6 @@
%{instdir}/program/textinstream.uno.so
%{instdir}/program/textoutstream.uno.so
%{instdir}/program/typeconverter.uno.so
-%{instdir}/program/typemgr.uno.so
%{instdir}/program/types.rdb
%{instdir}/program/ucpexpand1.uno.so
%{instdir}/program/ucptdoc1.uno.so
@@ -2138,6 +2134,7 @@
%{_datadir}/mimelnk/application/*extension*
#linkopt libs
%if ! %{linkopt}
+#crude merge ones
%{instdir}/program/behelper.uno.so
%{instdir}/program/configmgr2.uno.so
%{instdir}/program/desktopbe1.uno.so
@@ -2179,6 +2176,18 @@
%{instdir}/program/localebe1.uno.so
%{instdir}/program/sysmgr1.uno.so
%{instdir}/program/ucpgvfs1.uno.so
+#stocmerge ones
+%{instdir}/program/implreg.uno.so
+%{instdir}/program/nestedreg.uno.so
+%{instdir}/program/regtypeprov.uno.so
+%{instdir}/program/security.uno.so
+%{instdir}/program/servicemgr.uno.so
+%{instdir}/program/shlibloader.uno.so
+%{instdir}/program/simplereg.uno.so
+%{instdir}/program/typemgr.uno.so
+%else
+#stocmerge ones
+%{instdir}/program/bootstrap.uno.so
%endif
%post core
@@ -2651,6 +2660,9 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Tue May 29 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-17.3
+- add jan's stocmerge.all.patch
+
* Wed May 23 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-17.2
- remove LD_LIBRARY_PATH again, the third party extension requiring it
links against the wrong libraries
- Previous message (by thread): rpms/gnu-smalltalk/devel gst-2.3.4-am.patch, NONE, 1.1 gst-2.3.4-gdbm.patch, NONE, 1.1 gst-2.3.4-geo.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 gnu-smalltalk.spec, 1.14, 1.15 sources, 1.5, 1.6 gst-2.3.3-am.patch, 1.1, NONE gst-2.3.3-path.patch, 1.1, NONE gst-2.3.3-pub.patch, 1.1, NONE
- Next message (by thread): rpms/mash/devel .cvsignore, 1.3, 1.4 mash.spec, 1.2, 1.3 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list