[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/openoffice.org/devel openoffice.org-2.0.1.oooXXXXX.m400.buildissues.patch, 1.1, 1.2 openoffice.org.spec, 1.550, 1.551



Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30924

Modified Files:
	openoffice.org-2.0.1.oooXXXXX.m400.buildissues.patch 
	openoffice.org.spec 
Log Message:
some things moved around

openoffice.org-2.0.1.oooXXXXX.m400.buildissues.patch:
 inc_openoffice/unix/packagelist.txt                                  |    0 
 instsetoo_native/inc_openoffice/unix/packagelist.txt                 |   12 +++++-----
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |    7 -----
 registry/data/org/openoffice/Office/UI/GenericCommands.xcu           |    0 
 source/misc/restrictedpaths.cxx                                      |    0 
 svtools/source/misc/restrictedpaths.cxx                              |    2 -
 6 files changed, 7 insertions(+), 14 deletions(-)

Index: openoffice.org-2.0.1.oooXXXXX.m400.buildissues.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.1.oooXXXXX.m400.buildissues.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.1.oooXXXXX.m400.buildissues.patch	15 Nov 2005 19:26:21 -0000	1.1
+++ openoffice.org-2.0.1.oooXXXXX.m400.buildissues.patch	16 Nov 2005 08:54:17 -0000	1.2
@@ -35,3 +35,32 @@
          </node>
  		<node oor:name="Popups">
  			<node oor:name=".uno:HelpMenu" oor:op="replace">
+Index: inc_openoffice/unix/packagelist.txt
+===================================================================
+RCS file: /cvs/installation/instsetoo_native/inc_openoffice/unix/packagelist.txt,v
+retrieving revision 1.20
+diff -u -r1.20 packagelist.txt
+--- openoffice.org.orig/instsetoo_native/inc_openoffice/unix/packagelist.txt	11 Nov 2005 10:39:31 -0000	1.20
++++ openoffice.org/instsetoo_native/inc_openoffice/unix/packagelist.txt	16 Nov 2005 08:52:06 -0000
+@@ -246,15 +246,15 @@
+ 
+ Start
+ module = "gid_Module_Optional_Pymailmerge"
+-solarispackagename = "openofficeorg-emailmerge"
+-solarisrequires = "openofficeorg-pyuno"
+-packagename = "openoffice.org-emailmerge"
+-linuxreplaces = "openofficeorg-emailmerge"
+-requires = "openoffice.org-pyuno"
++solarispackagename = "%UNIXPRODUCTNAMEWITHOUTDOT-emailmerge"
++solarisrequires = "%UNIXPRODUCTNAMEWITHOUTDOT-pyuno"
++packagename = "%UNIXPRODUCTNAME-emailmerge"
++linuxreplaces = "%UNIXPRODUCTNAMEWITHOUTDOT-emailmerge"
++requires = "%UNIXPRODUCTNAME-pyuno"
+ copyright = "1999-2005 by OpenOffice.org"
+ vendor = "OpenOffice.org"
+ description = "Email mailmerge module for %PRODUCTNAME %PRODUCTVERSION"
+-destpath = "/opt/openoffice.org%PRODUCTVERSION"
++destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
+ End
+ 
+ Start


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.550
retrieving revision 1.551
diff -u -r1.550 -r1.551
--- openoffice.org.spec	15 Nov 2005 19:26:21 -0000	1.550
+++ openoffice.org.spec	16 Nov 2005 08:54:17 -0000	1.551
@@ -2464,7 +2464,6 @@
 %{instdir}/program/regtypeprov.uno.so
 %{instdir}/program/remotebridge.uno.so
 %dir %{instdir}/program/resource
-%{instdir}/program/resource/abp680en-US.res
 %{instdir}/program/resource/avmedia680en-US.res
 %{instdir}/program/resource/basctl680en-US.res
 %{instdir}/program/resource/bf_frm680en-US.res
@@ -2477,8 +2476,6 @@
 %{instdir}/program/resource/bib680en-US.res
 %{instdir}/program/resource/cal680en-US.res
 %{instdir}/program/resource/dba680en-US.res
-%{instdir}/program/resource/dbp680en-US.res
-%{instdir}/program/resource/dbu680en-US.res
 %{instdir}/program/resource/dbw680en-US.res
 %{instdir}/program/resource/deployment680en-US.res
 %{instdir}/program/resource/deploymentgui680en-US.res


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]