rpms/openoffice.org/devel openoffice.org-2.3.0.ooo77885.stoc.bootstrap.patch, 1.1, 1.2 openoffice.org.spec, 1.1202, 1.1203
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Fri Jun 8 17:45:50 UTC 2007
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6063
Modified Files:
openoffice.org-2.3.0.ooo77885.stoc.bootstrap.patch
openoffice.org.spec
Log Message:
Resolves: rhbz#243305 missing xdg file for quickstart restart
openoffice.org-2.3.0.ooo77885.stoc.bootstrap.patch:
Index: openoffice.org-2.3.0.ooo77885.stoc.bootstrap.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.0.ooo77885.stoc.bootstrap.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.3.0.ooo77885.stoc.bootstrap.patch 8 Jun 2007 10:45:40 -0000 1.1
+++ openoffice.org-2.3.0.ooo77885.stoc.bootstrap.patch 8 Jun 2007 17:45:15 -0000 1.2
@@ -505,7 +505,7 @@
diff -ruN stoc.orig/source/bootstrap/rdbtdp.xml stoc/source/bootstrap/rdbtdp.xml
--- stoc.orig/source/bootstrap/rdbtdp.xml 1970-01-01 01:00:00.000000000 +0100
+++ stoc/source/bootstrap/rdbtdp.xml 2007-06-08 12:03:41.000000000 +0100
-@@ -0,0 +1,71 @@
+@@ -0,0 +1,72 @@
+<?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">
@@ -554,6 +554,7 @@
+ <type> com.sun.star.registry.XSimpleRegistry </type>
+ <type> com.sun.star.beans.PropertyAttribute </type>
+ <type> com.sun.star.beans.XPropertySet </type>
++ <type> com.sun.star.beans.XExactName </type>
+ <type> com.sun.star.container.NoSuchElementException </type>
+ <type> com.sun.star.container.XHierarchicalNameAccess </type>
+ <type> com.sun.star.container.XSet </type>
@@ -1299,7 +1300,7 @@
}
Reference< XSimpleRegistry > ImplementationRegistration::getRegistryFromServiceManager()
-@@ -1935,53 +1939,12 @@
+@@ -1935,53 +1939,13 @@
return xReg;
}
@@ -1308,6 +1309,7 @@
-//*************************************************************************
-static Reference<XInterface> SAL_CALL ImplementationRegistration_CreateInstance(
- const Reference<XComponentContext> & xCtx ) throw(Exception)
++}
+namespace stoc_bootstrap
{
- return (XImplementationRegistration *)new ImplementationRegistration(xCtx);
@@ -1336,12 +1338,12 @@
-//==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
- const sal_Char ** ppEnvTypeName, uno_Environment ** )
-+//*************************************************************************+ Reference<XInterface> SAL_CALL ImplementationRegistration_CreateInstance(
++//*************************************************************************
++ Reference<XInterface> SAL_CALL ImplementationRegistration_CreateInstance(
+ const Reference<XComponentContext> & xCtx ) // throw(Exception)
{
- *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+ return (XImplementationRegistration *)new stoc_impreg::ImplementationRegistration(xCtx);
-+}
}
-//==================================================================================================
-sal_Bool SAL_CALL component_writeInfo(
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1202
retrieving revision 1.1203
diff -u -r1.1202 -r1.1203
--- openoffice.org.spec 8 Jun 2007 11:09:46 -0000 1.1202
+++ openoffice.org.spec 8 Jun 2007 17:45:15 -0000 1.1203
@@ -32,7 +32,7 @@
%define ooo_base_name %{oootag}_m%{ooomilestone}
-#ExcludeArch: ppc64
+ExcludeArch: ppc64
Summary: OpenOffice.org comprehensive office suite.
Name: openoffice.org
Version: 2.2.1
@@ -1458,13 +1458,12 @@
#relocate the .desktop and icon files
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
-mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/base.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-base.desktop
-mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/calc.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-calc.desktop
-mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/impress.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-impress.desktop
-mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/writer.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-writer.desktop
-mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/math.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-math.desktop
-mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-draw.desktop
-rm -rf $RPM_BUILD_ROOT/%{instdir}/share/xdg
+cp $RPM_BUILD_ROOT/%{instdir}/share/xdg/base.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-base.desktop
+cp $RPM_BUILD_ROOT/%{instdir}/share/xdg/calc.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-calc.desktop
+cp $RPM_BUILD_ROOT/%{instdir}/share/xdg/impress.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-impress.desktop
+cp $RPM_BUILD_ROOT/%{instdir}/share/xdg/writer.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-writer.desktop
+cp $RPM_BUILD_ROOT/%{instdir}/share/xdg/math.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-math.desktop
+cp $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-draw.desktop
#get rid of the gnome icons
rm -rf sysui/output/usr/share/icons/gnome
#relocate the rest of them
@@ -2115,6 +2114,7 @@
%dir %{instdir}/share/uno_packages
%dir %{instdir}/share/uno_packages/cache
%{instdir}/share/wordbook
+%{instdir}/share/xdg/
%dir %{instdir}/share/xslt
%{instdir}/share/xslt/common
%dir %{instdir}/share/xslt/export
@@ -2680,6 +2680,7 @@
- add workspace.ppc64.patch
- extend selinux patch for ppc64 and sparc
- update stocmerge patch
+- Resolves: rhbz#243305 missing xdg file for quickstart restart
* Thu May 31 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-18.1
- next 2.2.1 release candidate
More information about the scm-commits
mailing list