rpms/openoffice.org/devel workspace.ucpgio1.patch, NONE, 1.1 openoffice.org.spec, 1.1491, 1.1492

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Thu May 1 10:54:23 UTC 2008


Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20879

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.ucpgio1.patch 
Log Message:
and here's the gio integration

workspace.ucpgio1.patch:

--- NEW FILE workspace.ucpgio1.patch ---
Index: gsl/shell/source/backends/gconfbe/makefile.mk
diff -u gsl/shell/source/backends/gconfbe/makefile.mk:1.17 gsl/shell/source/backends/gconfbe/makefile.mk:1.17.6.1
--- gsl/shell/source/backends/gconfbe/makefile.mk:1.17	Fri Apr 11 00:56:47 2008
+++ gsl/shell/source/backends/gconfbe/makefile.mk	Wed Apr 30 09:56:13 2008
@@ -50,7 +50,7 @@
 CFLAGS+=-DENABLE_LOCKDOWN
 .ENDIF
 
-.IF "$(ENABLE_GNOMEVFS)"!=""
+.IF "$(ENABLE_GNOMEVFS)"!="" || "$(ENABLE_GIO)"!=""
 COMPILER_WARN_ALL=TRUE
 PKGCONFIG_MODULES=gconf-2.0 gobject-2.0 ORBit-2.0 glib-2.0
 .INCLUDE: pkg_config.mk
@@ -90,7 +90,7 @@
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 
-.ENDIF          # "$(ENABLE_GNOMEVFS)"!=""
+.ENDIF          # "$(ENABLE_GNOMEVFS)"!="" || "$(ENABLE_GIO)"!=""
 
 # --- Targets ---
 
Index: api/offapi/com/sun/star/ucb/GIOContentProvider.idl
diff -u /dev/null api/offapi/com/sun/star/ucb/GIOContentProvider.idl:1.1.2.1
--- /dev/null	Thu May  1 03:26:06 2008
+++ api/offapi/com/sun/star/ucb/GIOContentProvider.idl	Wed Apr 30 09:42:54 2008
@@ -0,0 +1,15 @@
+#ifndef __com_sun_star_ucb_GIOContentProvider_idl__
+#define __com_sun_star_ucb_GIOContentProvider_idl__
+
+#ifndef __com_sun_star_ucb_XContentProvider_idl__
+#include <com/sun/star/ucb/XContentProvider.idl>
+#endif
+
+module com { module sun { module star { module ucb {
+service GIOContentProvider
+{
+       interface com::sun::star::ucb::XContentProvider;
+};
+
+}; }; }; };
+#endif
Index: api/offapi/com/sun/star/ucb/makefile.mk
diff -u api/offapi/com/sun/star/ucb/makefile.mk:1.48 api/offapi/com/sun/star/ucb/makefile.mk:1.48.26.1
--- api/offapi/com/sun/star/ucb/makefile.mk:1.48	Fri Apr 11 00:44:50 2008
+++ api/offapi/com/sun/star/ucb/makefile.mk	Wed Apr 30 09:42:54 2008
@@ -99,6 +99,7 @@
 	FTPContent.idl\
 	FTPContentProvider.idl\
 	GlobalTransferCommandArgument.idl\
+        GIOContentProvider.idl\
 	GnomeVFSContentProvider.idl\
 	GnomeVFSDocumentContent.idl\
 	GnomeVFSFolderContent.idl\
Index: installation/scp2/source/gnome/file_gnome.scp
diff -u installation/scp2/source/gnome/file_gnome.scp:1.7 installation/scp2/source/gnome/file_gnome.scp:1.7.32.2
--- installation/scp2/source/gnome/file_gnome.scp:1.7	Tue Apr 15 03:42:09 2008
+++ installation/scp2/source/gnome/file_gnome.scp	Wed Apr 30 09:54:49 2008
@@ -29,22 +29,26 @@
  ************************************************************************/
 #include "macros.inc"
 
-File gid_File_Lib_Gnomevfs
+#ifdef ENABLE_GIO
+File gid_File_Lib_GIO
     TXT_FILE_BODY;
-    Styles = (PACKED);
+    Styles = (PACKED,PATCH);
     Dir = gid_Dir_Program;
-    Name = STRING(CONCAT2(ucpgvfs1.uno,UNXSUFFIX));
+    Name = STRING(CONCAT2(ucpgio1.uno,UNXSUFFIX));
     RegistryID = gid_Starregistry_Services_Rdb;
-    Regmergefile = "ucpgvfs-ucd.txt";
+    Regmergefile = "ucpgio-ucd.txt";
 End
+#endif
 
-File gid_File_Lib_Gconfbe
+#ifdef ENABLE_GNOMEVFS
+
+File gid_File_Lib_Gnomevfs
     TXT_FILE_BODY;
     Styles = (PACKED);
     Dir = gid_Dir_Program;
-    Name = STRING(CONCAT2(gconfbe1.uno,UNXSUFFIX));
+    Name = STRING(CONCAT2(ucpgvfs1.uno,UNXSUFFIX));
     RegistryID = gid_Starregistry_Services_Rdb;
-    Regmergefile = "gconfbe1-ucd.txt";
+    Regmergefile = "ucpgvfs-ucd.txt";
 End
 
 File gid_File_Bin_Gnome_Set_Default_Application
@@ -54,3 +58,13 @@
     Styles = (PACKED);
 End
 
+#endif
+
+File gid_File_Lib_Gconfbe
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Program;
+    Name = STRING(CONCAT2(gconfbe1.uno,UNXSUFFIX));
+    RegistryID = gid_Starregistry_Services_Rdb;
+    Regmergefile = "gconfbe1-ucd.txt";
+End
Index: installation/scp2/source/gnome/makefile.mk
diff -u installation/scp2/source/gnome/makefile.mk:1.6 installation/scp2/source/gnome/makefile.mk:1.6.34.1
--- installation/scp2/source/gnome/makefile.mk:1.6	Thu Apr 10 02:19:01 2008
+++ installation/scp2/source/gnome/makefile.mk	Wed Apr 30 09:41:36 2008
@@ -43,7 +43,16 @@
 
 SCP_PRODUCT_TYPE=osl
 
+.IF "$(ENABLE_GNOMEVFS)" != "" || "$(ENABLE_GIO)" != ""
+
 .IF "$(ENABLE_GNOMEVFS)" != ""
+SCPDEFS+=-DENABLE_GNOMEVFS
+.ENDIF
+
+.IF "$(ENABLE_GIO)" != ""
+SCPDEFS+=-DENABLE_GIO
+.ENDIF
+
 PARFILES =                   \
         module_gnome.par     \
         file_gnome.par
Index: installation/scp2/source/gnome/module_gnome.scp
diff -u installation/scp2/source/gnome/module_gnome.scp:1.10 installation/scp2/source/gnome/module_gnome.scp:1.10.34.3
--- installation/scp2/source/gnome/module_gnome.scp:1.10	Thu Apr 10 02:19:15 2008
+++ installation/scp2/source/gnome/module_gnome.scp	Thu May  1 01:19:37 2008
@@ -30,6 +30,13 @@
 
 #include "macros.inc"
 
+File gid_File_Registry_Spool_Oo_Ucb_Configuration_GIOContentProvider_Xcu
+    TXT_FILE_BODY;
+    Dir = gid_Dir_Share_Registry_Modules_Oo_Ucb_Configuration;
+    Name = "/registry/spool/org/openoffice/ucb/Configuration-gio.xcu";
+    Styles = (PACKED,SCPZIP_REPLACE);
+End
+
 Module gid_Module_Optional_Gnome
     ParentID = gid_Module_Optional;
     Default = YES;
@@ -37,6 +44,13 @@
     MOD_NAME_DESC(MODULE_OPTIONAL_GNOME);
     Styles = (DONTSHOWINUSERINSTALL);
     XpdCheckSolaris = "SUNWgnome-vfs";
-    Files = (gid_File_Lib_Gnomevfs, gid_File_Lib_Gconfbe, gid_File_Bin_Gnome_Set_Default_Application);
+    Files = (
+#ifdef ENABLE_GNOMEVFS
+      gid_File_Lib_Gnomevfs, gid_File_Bin_Gnome_Set_Default_Application,
+#endif
+#ifdef ENABLE_GIO
+      gid_File_Lib_GIO, gid_File_Registry_Spool_Oo_Ucb_Configuration_GIOContentProvider_Xcu
+#endif
+      gid_File_Lib_Gconfbe);
 End
 
Index: installation/scp2/source/ooo/directory_ooo.scp
diff -u installation/scp2/source/ooo/directory_ooo.scp:1.47 installation/scp2/source/ooo/directory_ooo.scp:1.47.30.1
--- installation/scp2/source/ooo/directory_ooo.scp:1.47	Tue Apr 15 07:48:48 2008
+++ installation/scp2/source/ooo/directory_ooo.scp	Thu May  1 01:19:37 2008
@@ -876,6 +876,16 @@
     HostName = "UISort";
 End
 
+Directory gid_Dir_Share_Registry_Modules_Oo_Ucb
+    ParentID = gid_Dir_Share_Registry_Modules_Oo;
+    HostName = "ucb";
+End
+
+Directory gid_Dir_Share_Registry_Modules_Oo_Ucb_Configuration
+    ParentID = gid_Dir_Share_Registry_Modules_Oo_Ucb;
+    HostName = "Configuration";
+End
+
 Directory gid_Dir_Share_Registry_Modules_Oo_Setup
     ParentID = gid_Dir_Share_Registry_Modules_Oo;
     HostName = "Setup";
Index: installation/scp2/util/makefile.mk
diff -u installation/scp2/util/makefile.mk:1.46 installation/scp2/util/makefile.mk:1.46.34.1
--- installation/scp2/util/makefile.mk:1.46	Thu Apr 10 03:04:24 2008
+++ installation/scp2/util/makefile.mk	Wed Apr 30 09:41:36 2008
@@ -143,7 +143,7 @@
 .ENDIF
 
 .IF "$(GUI)"=="UNX"
-.IF "$(ENABLE_GNOMEVFS)" != ""
+.IF "$(ENABLE_GNOMEVFS)" != "" || "$(ENABLE_GIO)" != ""
 SCP1FILES += \
              module_gnome.par   \
              file_gnome.par
@@ -287,7 +287,7 @@
 .ENDIF
 
 .IF "$(GUI)"=="UNX"
-.IF "$(ENABLE_GNOMEVFS)" != ""
[...3316 lines suppressed...]
@@ -0,0 +1,83 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile$
+#
+# $Revision$
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org 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 version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+PRJNAME=ucb
+# Version
+UCPGIO_MAJOR=1
+TARGET=ucpgio
+ENABLE_EXCEPTIONS=TRUE
+USE_DEFFILE=TRUE
+NO_BSYMBOLIC=TRUE
+
+.INCLUDE: settings.mk
+
+UNIXTEXT=$(MISC)/$(TARGET)-ucd.txt
+
+.IF "$(ENABLE_GIO)"!=""
+COMPILER_WARN_ALL=TRUE
+PKGCONFIG_MODULES=gio-2.0
+.INCLUDE: pkg_config.mk
+
+.IF "$(OS)" == "SOLARIS"
+LINKFLAGS+=-z nodefs
+.ENDIF          # "$(OS)" == "SOLARIS"
+
+# no "lib" prefix
+DLLPRE =
+
+SLOFILES=$(SLO)$/gio_provider.obj\
+         $(SLO)$/gio_content.obj\
+         $(SLO)$/gio_resultset.obj\
+         $(SLO)$/gio_datasupplier.obj\
+         $(SLO)$/gio_seekable.obj\
+         $(SLO)$/gio_inputstream.obj\
+         $(SLO)$/gio_outputstream.obj\
+         $(SLO)$/gio_mount.obj
+
+SHL1TARGET=$(TARGET)$(UCPGIO_MAJOR).uno
+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+SHL1LIBS=$(SLB)$/$(TARGET).lib
+SHL1IMPLIB=i$(TARGET)
+SHL1STDLIBS=\
+	$(CPPUHELPERLIB) \
+	$(CPPULIB) \
+	$(SALLIB)  \
+	$(SALHELPERLIB)  \
+	$(UCBHELPERLIB)
+
+SHL1STDLIBS+=$(PKGCONFIG_LIBS)
+
+SHL1VERSIONMAP= exports.map
+
+.ENDIF          # "$(ENABLE_GIO)"!=""
+
+.INCLUDE: target.mk
Index: ucb/ucb/source/ucp/gio/ucpgio-ucd.txt
diff -u /dev/null ucb/ucb/source/ucp/gio/ucpgio-ucd.txt:1.1.2.1
--- /dev/null	Thu May  1 03:26:52 2008
+++ ucb/ucb/source/ucp/gio/ucpgio-ucd.txt	Wed Apr 30 09:35:19 2008
@@ -0,0 +1,6 @@
+[ComponentDescriptor]
+ImplementationName=com.sun.star.comp.GIOContentProvider
+ComponentName=ucpgio1.uno.so
+LoaderName=com.sun.star.loader.SharedLibrary
+[SupportedServices]
+com.sun.star.ucb.GIOContentProvider
Index: ucb/ucb/source/ucp/gio/ucpgio.xml
diff -u /dev/null ucb/ucb/source/ucp/gio/ucpgio.xml:1.1.2.1
--- /dev/null	Thu May  1 03:26:52 2008
+++ ucb/ucb/source/ucp/gio/ucpgio.xml	Wed Apr 30 09:35:20 2008
@@ -0,0 +1,100 @@
+<?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>
+	ucpgio
+    </module-name>
+
+    <component-description>
+        <author>
+            Caolán McNamara &;amp; Jan Navrati
+        </author>
+        <name>
+            com.sun.star.comp.ucb.GIOContentProvider
+        </name>
+        <description>
+	    This component implements a Content Provider for the Universal
+            Content Broker. It provides access to contents stored on an GIO
+            location.
+        </description>
+        <loader-name>
+            com.sun.star.loader.SharedLibrary
+        </loader-name>
+        <language>
+            c++
+        </language>
+        <status value="final"/>
+        <supported-service>
+            com.sun.star.ucb.GIOContentProvider
+        </supported-service>
+
+        <service-dependency>
+            com.sun.star.configuration.ConfigurationAccess
+        </service-dependency>
+        <service-dependency>
+            com.sun.star.configuration.ConfigurationProvider
+        </service-dependency>
+    </component-description>
+
+    <project-build-dependency> external           </project-build-dependency>
+    <project-build-dependency> sal                </project-build-dependency>
+    <project-build-dependency> cppu               </project-build-dependency>
+    <project-build-dependency> cppuhelper         </project-build-dependency>
+    <project-build-dependency> ucbhelper          </project-build-dependency>
+
+    <runtime-module-dependency> sal3              </runtime-module-dependency>
+    <runtime-module-dependency> cppu3             </runtime-module-dependency>
+    <runtime-module-dependency>	cppuhelper3$(COM) </runtime-module-dependency>
+    <runtime-module-dependency>	ucbhelper4$(COM)  </runtime-module-dependency>
+
+    <type> com.sun.star.beans.PropertyAttribute                </type>
+    <type> com.sun.star.beans.PropertyValue                    </type>
+    <type> com.sun.star.beans.XPropertiesChangeNotifier        </type>
+    <type> com.sun.star.beans.XPropertyAccess                  </type>
+    <type> com.sun.star.beans.XPropertyContainer               </type>
+    <type> com.sun.star.beans.XPropertySetInfoChangeNotifier   </type>
+    <type> com.sun.star.container.XChild                       </type>
+    <type> com.sun.star.container.XNameAccess                  </type>
+    <type> com.sun.star.io.XActiveDataSink                     </type>
+    <type> com.sun.star.io.XInputStream                        </type>
+    <type> com.sun.star.io.XOutputStream                       </type>
+    <type> com.sun.star.io.XSeekable                           </type>
+    <type> com.sun.star.lang.IllegalAccessException            </type>
+    <type> com.sun.star.lang.XComponent                        </type>
+    <type> com.sun.star.lang.XMultiServiceFactory              </type>
+    <type> com.sun.star.lang.XServiceInfo                      </type>
+    <type> com.sun.star.lang.XSingleServiceFactory             </type>
+    <type> com.sun.star.lang.XTypeProvider                     </type>
+    <type> com.sun.star.registry.XRegistryKey                  </type>
+    <type> com.sun.star.sdbc.XCloseable                        </type>
+    <type> com.sun.star.sdbc.XColumnLocate                     </type>
+    <type> com.sun.star.sdbc.XResultSetMetaDataSupplier        </type>
+    <type> com.sun.star.sdbc.XRow                              </type>
+    <type> com.sun.star.ucb.ContentCreationException           </type>
+    <type> com.sun.star.ucb.ContentInfoAttribute               </type>
+    <type> com.sun.star.ucb.InsertCommandArgument              </type>
+    <type> com.sun.star.ucb.MissingInputStreamException        </type>
+    <type> com.sun.star.ucb.MissingPropertiesException         </type>
+    <type> com.sun.star.ucb.NameClash                          </type>
+    <type> com.sun.star.ucb.NameClashException                 </type>
+    <type> com.sun.star.ucb.OpenCommandArgument2               </type>
+    <type> com.sun.star.ucb.OpenMode                           </type>
+    <type> com.sun.star.ucb.PostCommandArgument2               </type>
+    <type> com.sun.star.ucb.RememberAuthentication             </type>
+    <type> com.sun.star.ucb.ResultSetException                 </type>
+    <type> com.sun.star.ucb.TransferInfo                       </type>
+    <type> com.sun.star.ucb.XCommandEnvironment                </type>
+    <type> com.sun.star.ucb.UnsupportedCommandException        </type>
+    <type> com.sun.star.ucb.UnsupportedDataSinkException       </type>
+    <type> com.sun.star.ucb.UnsupportedNameClashException      </type>
+    <type> com.sun.star.ucb.UnsupportedOpenModeException       </type>
+    <type> com.sun.star.ucb.XCommandInfo                       </type>
+    <type> com.sun.star.ucb.XCommandInfoChangeNotifier         </type>
+    <type> com.sun.star.ucb.XCommandProcessor                  </type>
+    <type> com.sun.star.ucb.XContentAccess                     </type>
+    <type> com.sun.star.ucb.XContentProvider                   </type>
+    <type> com.sun.star.ucb.XDynamicResultSet                  </type>
+    <type> com.sun.star.ucb.XPersistentPropertySet             </type>
+    <type> com.sun.star.util.DateTime                          </type>
+</module-description>


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1491
retrieving revision 1.1492
diff -u -r1.1491 -r1.1492
--- openoffice.org.spec	30 Apr 2008 15:15:09 -0000	1.1491
+++ openoffice.org.spec	1 May 2008 10:53:41 -0000	1.1492
@@ -63,10 +63,10 @@
 BuildRequires:	libXt-devel, libICE-devel, libjpeg-devel, db4-devel, gperf
 BuildRequires:	gecko-devel, libwpd-devel, hunspell-devel, unixODBC-devel
 BuildRequires:	sane-backends-devel, libicu-devel, perl-Archive-Zip
-BuildRequires:	freetype-devel, gtk2-devel, gnome-vfs2-devel, desktop-file-utils
+BuildRequires:	freetype-devel, gtk2-devel, desktop-file-utils, hyphen-devel
 BuildRequires:	evolution-data-server-devel, libtextcat-devel, nss-devel
-BuildRequires:	gstreamer-devel, gstreamer-plugins-base-devel, hyphen-devel
-BuildRequires:	openssl-devel, lpsolve-devel, xalan-j2, xerces-j2, hsqldb, bsh
+BuildRequires:	gstreamer-devel, gstreamer-plugins-base-devel, openssl-devel
+BuildRequires:	lpsolve-devel, xalan-j2, xerces-j2, hsqldb, bsh
 
 Patch0:  openoffice.org-simple-crash_report.sh
 Patch1:  openoffice.org-multiliblauncher.sh
@@ -139,6 +139,7 @@
 Patch66: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
 Patch67: openoffice.org-3.0.0.ooo88375.filter.disablepdf.patch
 Patch68: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
+Patch69: workspace.ucpgio1.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1247,6 +1248,7 @@
 %patch66 -p1 -b .ooo88341.sc.verticalboxes.patch
 %patch67 -p1 -b .ooo88375.filter.disablepdf.patch
 %patch68 -p1 -b .ooo6087.sc.sheetnames.patch
+%patch69 -p1 -b .workspace.ucpgio1.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1255,7 +1257,7 @@
 cd config_office
 autoconf
 export PATH=$PATH:/usr/sbin
-%configure --with-build-version="Ver: %{version}-%{release}" --with-unix-wrapper=%{name} --with-use-shell=bash --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --with-vba-package-format="builtin" --enable-dbus --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-hunspell --with-system-altlinuxhyph --with-system-libtextcat --with-system-vigra --without-myspell-dicts --without-system-mspack --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms --without-writer2latex %{stlflags} --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS" --disable-pdfimport
+%configure --with-build-version="Ver: %{version}-%{release}" --with-unix-wrapper=%{name} --with-use-shell=bash --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --disable-gnome-vfs --enable-gio --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --with-vba-package-format="builtin" --enable-dbus --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-hunspell --with-system-altlinuxhyph --with-system-libtextcat --with-system-vigra --without-myspell-dicts --without-system-mspack --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms --without-writer2latex %{stlflags} --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS" --disable-pdfimport
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
@@ -2502,7 +2504,7 @@
 %{basisinstdir}/program/libxo%{SOPOST}.so
 %{basisinstdir}/program/localebe1.uno.so
 %{basisinstdir}/program/sysmgr1.uno.so
-%{basisinstdir}/program/ucpgvfs1.uno.so
+%{basisinstdir}/program/ucpgio1.uno.so
 %{basisinstdir}/program/stocservices.uno.so
 #vba
 %{basisinstdir}/program/oovbaapi.rdb
@@ -3315,6 +3317,7 @@
 - drop openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
 - drop openoffice.org-2.2.0.rh232389.tango.patch
 - Resolves: rhbz#444571 add openoffice.org-3.0.0.ooo88090.chart2.negativecount.patch
+- add workspace.ucpgio1.patch and disable gnome-vfs
 
 * Mon Apr 21 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.9.1
 - Resolves: rhbz#358021 enable BrOffice.org brand




More information about the scm-commits mailing list