rpms/openoffice.org/devel openoffice.org-1.9.125.ooo53699.uzipunused.postprocess.patch, NONE, 1.1 openoffice.org-1.9.125.oooXXXXX.bulletexport.vcl.patch, NONE, 1.1 openoffice.org.spec, 1.411, 1.412 sources, 1.106, 1.107

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Aug 24 09:11:24 UTC 2005 

Author: caolanm

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

Modified Files:
	openoffice.org.spec sources 
Added Files:
	openoffice.org-1.9.125.ooo53699.uzipunused.postprocess.patch 
	openoffice.org-1.9.125.oooXXXXX.bulletexport.vcl.patch 
Log Message:
remove unzip

openoffice.org-1.9.125.ooo53699.uzipunused.postprocess.patch:
 postprocess/prj/build.lst            |    2 +-
 prj/build.lst                        |    0 
 scp2/source/ooo/file_library_ooo.scp |    6 ------
 source/ooo/file_library_ooo.scp      |    0 
 4 files changed, 1 insertion(+), 7 deletions(-)

--- NEW FILE openoffice.org-1.9.125.ooo53699.uzipunused.postprocess.patch ---
Index: source/ooo/file_library_ooo.scp
===================================================================
RCS file: /cvs/installation/scp2/source/ooo/file_library_ooo.scp,v
retrieving revision 1.137
diff -u -r1.137 file_library_ooo.scp
--- openoffice.org.orig/scp2/source/ooo/file_library_ooo.scp	18 Aug 2005 08:12:56 -0000	1.137
+++ openoffice.org/scp2/source/ooo/file_library_ooo.scp	24 Aug 2005 07:42:00 -0000
@@ -2075,12 +2075,6 @@
 UNO_JAR_FILE( gid_File_Jar_Xsltvalidate, XSLTValidate )
 #endif
 
-#ifdef UNX
-
-STD_LIB_FILE( gid_File_Lib_Zip, zip )
-
-#endif
-
 #ifndef SYSTEM_LIBXML
 File gid_File_Lib_Xml2
     TXT_FILE_BODY;
@@ -2174,6 +2168,7 @@
Index: prj/build.lst
===================================================================
RCS file: /cvs/installation/postprocess/prj/build.lst,v
retrieving revision 1.17
diff -u -r1.17 build.lst
--- openoffice.org.orig/postprocess/prj/build.lst	16 Aug 2005 09:28:30 -0000	1.17
+++ openoffice.org/postprocess/prj/build.lst	24 Aug 2005 07:43:24 -0000
@@ -1,4 +1,4 @@
-po	postprocess	::	accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MathMLDTD msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd setup_native slideshow starmath sw testshl testshl2 testtools ucb UnoControls unoxml unzip ure wizards xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top NULL
+po	postprocess	::	accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MathMLDTD msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd setup_native slideshow starmath sw testshl testshl2 testtools ucb UnoControls unoxml ure wizards xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL

openoffice.org-1.9.125.oooXXXXX.bulletexport.vcl.patch:
 source/gdi/fontcvt.cxx     |    0 
 vcl/source/gdi/fontcvt.cxx |   27 ++++++++++++++-------------
 2 files changed, 14 insertions(+), 13 deletions(-)

--- NEW FILE openoffice.org-1.9.125.oooXXXXX.bulletexport.vcl.patch ---
Index: source/gdi/fontcvt.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/gdi/fontcvt.cxx,v
retrieving revision 1.16
diff -u -p -r1.16 fontcvt.cxx
--- openoffice.org.orig/vcl/source/gdi/fontcvt.cxx	30 Aug 2004 16:21:05 -0000	1.16
+++ openoffice.org/vcl/source/gdi/fontcvt.cxx	24 Aug 2005 08:50:22 -0000
@@ -1109,19 +1109,20 @@ struct ExtraTable { sal_Unicode cStar; s
 
 ExtraTable aWingDingsExtraTab[] =
 {
-    {0xe000, 0x6F}, {0xe001, 0x73}, {0xe002, 0x74}, {0xe003, 0x75},
-    {0xe004, 0x77}, {0xe005, 0xA6}, {0xe006, 0xE0}, {0xe007, 0xFC},
-    {0xe008, 0x6C}, {0xe009, 0x6D}, {0xe00a, 0x6E}, {0xe00b, 0x72},
-    {0xe00c, 0x75}, {0xe00d, 0x76}, {0xe00e, 0x74}, {0xe00f, 0x8B},
-    {0xe010, 0x80}, {0xe011, 0x2B}, {0xe012, 0x3A}, {0xe013, 0x5D},
-    {0xe014, 0x29}, {0xe015, 0x3A}, {0xe016, 0x3C}, {0xe017, 0x38},
-    {0xe018, 0x3A}, {0xe019, 0x2A}, {0xe01a, 0x2B}, {0xe01b, 0x3F},
-    {0xe01c, 0x9F}, {0xe01d, 0x80}, {0xe01e, 0x8B}, {0xe023, 0x4A},
-    {0xe025, 0xF0}, {0xe026, 0xF2}, {0xe027, 0xEF}, {0xe028, 0xF1},
-    {0xe029, 0x52}, {0xe02a, 0x29}, {0xe02b, 0xE0}, {0xe02c, 0xE2},
-    {0xe02d, 0xDF}, {0xe02e, 0xE1}, {0xe02f, 0xAC}, {0xe030, 0xAD},
-    {0xe031, 0xAE}, {0xe032, 0x7C}, {0xe033, 0x43}, {0xe034, 0x4D},
-    {0xe0aa, 0x71}, {0xe422, 0x44}
+    {0x25cf, 0x6C}, {0x2714, 0xFC}, {0x2717, 0xFB}, {0x2794, 0xE8}, 
+    {0x27a2, 0xD8}, {0xe000, 0x6F}, {0xe001, 0x73}, {0xe002, 0x74}, 
+    {0xe003, 0x75}, {0xe004, 0x77}, {0xe005, 0xA6}, {0xe006, 0xE0}, 
+    {0xe007, 0xFC}, {0xe008, 0x6C}, {0xe009, 0x6D}, {0xe00a, 0x6E}, 
+    {0xe00b, 0x72}, {0xe00c, 0x75}, {0xe00d, 0x76}, {0xe00e, 0x74}, 
+    {0xe00f, 0x8B}, {0xe010, 0x80}, {0xe011, 0x2B}, {0xe012, 0x3A}, 
+    {0xe013, 0x5D}, {0xe014, 0x29}, {0xe015, 0x3A}, {0xe016, 0x3C}, 
+    {0xe017, 0x38}, {0xe018, 0x3A}, {0xe019, 0x2A}, {0xe01a, 0x2B}, 
+    {0xe01b, 0x3F}, {0xe01c, 0x9F}, {0xe01d, 0x80}, {0xe01e, 0x8B}, 
+    {0xe023, 0x4A}, {0xe025, 0xF0}, {0xe026, 0xF2}, {0xe027, 0xEF}, 
+    {0xe028, 0xF1}, {0xe029, 0x52}, {0xe02a, 0x29}, {0xe02b, 0xE0}, 
+    {0xe02c, 0xE2}, {0xe02d, 0xDF}, {0xe02e, 0xE1}, {0xe02f, 0xAC},  
+    {0xe030, 0xAD}, {0xe031, 0xAE}, {0xe032, 0x7C}, {0xe033, 0x43}, 
+    {0xe034, 0x4D}, {0xe0aa, 0x71}, {0xe422, 0x44}
 };
 
 ExtraTable aSymbolExtraTab2[] =


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -r1.411 -r1.412
--- openoffice.org.spec	23 Aug 2005 19:06:46 -0000	1.411
+++ openoffice.org.spec	24 Aug 2005 09:11:21 -0000	1.412
@@ -171,6 +171,8 @@
 Patch51: openoffice.org-1.9.125.ooo53612.systemnp_sdk.extensions.patch
 Patch52: workspace.cmcfixes15.patch
 Patch53: openoffice.org-1.9.125.ooo53682.nfslock.sal.patch
+Patch54: openoffice.org-1.9.125.ooo53699.uzipunused.postprocess.patch
+Patch55: openoffice.org-1.9.125.oooXXXXX.bulletexport.vcl.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -826,6 +828,8 @@
 %patch51 -p1 -b .ooo53612.systemnp_sdk.extensions.patch
 %patch52 -p1 -b .workspace.cmcfixes15.patch
 %patch53 -p1 -b .ooo53682.nfslock.sal.patch
+%patch54 -p1 -b .ooo53699.uzipunused.postprocess.patch
+%patch55 -p1 -b .oooXXXXX.bulletexport.vcl.patch
 
 %if %{includeexternals}
 #start ludicrous workaround
@@ -889,8 +893,6 @@
 unset USERNAME
 #don't duplicate english helpcontent about the place
 unset DEFAULT_TO_ENGLISH_FOR_PACKING
-#qadevOOo has some iso8859-16 but non utf-8 char sequences java chars
-export LANG=en_US.iso885915
 
 %if %{usegcc3}
 #this is needed for a mix of gcc/g++ 3.4.x and gcj/gij 4.0.x
@@ -3111,6 +3113,7 @@
 - use only underlying toolkit startup notification
 - use proper nfslock fix
 - workspace.cmcfixes15.patch, no MathMLDTD or msfontextract foo
+- openoffice.org-1.9.125.oooXXXXX.bulletexport.vcl.patch
 
 * Mon Aug 22 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.125-2
 - rh#166432# add README to he_IL dictionary


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- sources	23 Aug 2005 18:27:10 -0000	1.106
+++ sources	24 Aug 2005 09:11:21 -0000	1.107
@@ -4,5 +4,5 @@
 c733528059f1ea2b51c78d07738bf121  gcj-sed.sh
 a4a22f6b80a4f02c01bbe0400e131e57  RegisterAndLicence.xcu
 73aac8274b29c79ac2041d0963faa2b8  openoffice.org-myspell-contrib.tar.gz
-83a7ded778ee5be2a060ffa1146fa8f8  SRC680_m125.tar.bz2
 66ee360bd11d33b0ba2283922d853706  opens___.ttf
+4dc996ea8b28b2c3256094e6fcc92a50  SRC680_m125.tar.bz2

More information about the fedora-cvs-commits mailing list