rpms/openoffice.org/devel openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch, 1.2, 1.2.2.1 openoffice.org.spec, 1.1440.2.11, 1.1440.2.12 workspace.cmcfixes43.patch, 1.1.2.4, 1.1.2.5 openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch, 1.1, NONE

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Mon Mar 10 19:57:45 UTC 2008 

Author: caolanm

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

Modified Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch 
	openoffice.org.spec workspace.cmcfixes43.patch 
Removed Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch 
Log Message:
remove subsumed patch

openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch:

Index: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch	15 Jan 2008 12:30:51 -0000	1.2
+++ openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch	10 Mar 2008 19:57:24 -0000	1.2.2.1
@@ -356,14 +356,3 @@
                  aSuppLocales.realloc(numlocs);
  
              } else {
---- openoffice.org.orig/solenv/inc/libs.mk	2007-12-12 13:15:14.000000000 +0000
-+++ openoffice.org/inc/libs.mk	2008-01-08 08:56:51.000000000 +0000
-@@ -326,7 +326,7 @@
- SABLOT3RDLIB=-lsablot
- APP3RDLIB=-lapp
- SAMPLE3RDLIB=-lsample
--HNJLIB=-lhnj
-+HNJLIB=-lhyphen
- MYSPELLLIB=-lmyspell
- COSVLIB=-lcosv
- UDMLIB=-ludm


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440.2.11
retrieving revision 1.1440.2.12
diff -u -r1.1440.2.11 -r1.1440.2.12
--- openoffice.org.spec	10 Mar 2008 16:02:29 -0000	1.1440.2.11
+++ openoffice.org.spec	10 Mar 2008 19:57:24 -0000	1.1440.2.12
@@ -56,18 +56,17 @@
 Source4:	http://people.redhat.com/caolanm/templates/redhat-templates.tar.gz
 Source5:        http://www.openoffice.org/nonav/issues/showattachment.cgi/50963/bengali.sdf
 Source6:        http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
-BuildRequires:	zip, findutils, autoconf, flex, bison, gperf, ant, icu, gcc-c++
-BuildRequires:  perl-Compress-Zlib, binutils, unixODBC-devel, xalan-j2, bc
-BuildRequires:	gdb, %{java_devel}, zlib-devel, vigra-devel, hsqldb, libXt-devel
-BuildRequires:	freetype-devel, gtk2-devel, gnome-vfs2-devel, cups-devel, bsh
-BuildRequires:	libcurl-devel, boost-devel, python-devel, expat-devel
-BuildRequires:	libxml2-devel, neon-devel >= 0.27.0, libidn-devel, pam-devel
-BuildRequires:	libjpeg-devel, sane-backends-devel, libICE-devel, hunspell-devel
-BuildRequires:  evolution-data-server-devel, libxslt-devel, desktop-file-utils
-BuildRequires:  libxslt-devel, db4-devel, xulrunner-devel, libwpd-devel
-BuildRequires:  gstreamer-devel, gstreamer-plugins-base-devel, libicu-devel
-BuildRequires:  perl-Archive-Zip, libtextcat-devel, nss-devel >= 3.11.7-8
-BuildRequires:  xerces-j2, hyphen-devel, openssl-devel, lpsolve-devel
+BuildRequires:	zip, findutils, autoconf, flex, bison, ant, icu, gcc-c++, gdb
+BuildRequires:	binutils, %{java_devel}, boost-devel, zlib-devel, vigra-devel
+BuildRequires:	python-devel, expat-devel, libxml2-devel, libxslt-devel, bc
+BuildRequires:	neon-devel, libcurl-devel, libidn-devel, pam-devel, cups-devel
+BuildRequires:	libXt-devel, libICE-devel, libjpeg-devel, db4-devel
+BuildRequires:	xulrunner-devel, libwpd-devel, hunspell-devel, unixODBC-devel
+BuildRequires:	sane-backends-devel, libicu-devel, perl-Archive-Zip, gperf
+BuildRequires:	freetype-devel, gtk2-devel, gnome-vfs2-devel, desktop-file-utils
+BuildRequires:	evolution-data-server-devel, libtextcat-devel, nss-devel
+BuildRequires:	gstreamer-devel, gstreamer-plugins-base-devel, hyphen-devel,
+BuildRequires:	openssl-devel, xalan-j2, xerces-j2, hsqldb, bsh, lpsolve-devel
 
 Patch0:  openoffice.org-simple-crash_report.sh
 Patch1:  openoffice.org-multiliblauncher.sh
@@ -127,22 +126,20 @@
 Patch53: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
 Patch54: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
 Patch55: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
-Patch56: openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch
-Patch57: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
-Patch58: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
-Patch59: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch60: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
-Patch61: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
-Patch62: workspace.cairotext01.patch
-Patch63: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
-Patch64: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
-Patch65: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch66: openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch
-Patch67: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
-Patch68: workspace.cmcfixes43.patch
-Patch69: openoffice.org-3.0.0.ooo86588.sw.buildfix.patch
-Patch70: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
-Patch71: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
+Patch56: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
+Patch57: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
+Patch58: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
+Patch59: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
+Patch60: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
+Patch61: workspace.cairotext01.patch
+Patch62: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
+Patch63: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
+Patch64: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+Patch65: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
+Patch66: workspace.cmcfixes43.patch
+Patch67: openoffice.org-3.0.0.ooo86588.sw.buildfix.patch
+Patch68: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
+Patch69: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
 
 %define instdir %{_libdir}/openoffice.org
 %define OFFICEUPD 300
@@ -1086,22 +1083,20 @@
 %patch53 -p1 -b .ooo84676.ucb.davprotocol.patch
 %patch54 -p1 -b .ooo84621.sw.insertexcel.patch
 %patch55 -p1 -b .ooo85054.stlport.noorigs.patch
-%patch56 -p1 -b .ooo86670.config_office.xpcomasxul.patch
-%patch57 -p1 -b .ooo85097.desktop.pagein.patch
-%patch58 -p1
-%patch59 -p1 -b .rh133741.alwaysgtk.vcl.patch
-%patch60 -p1 -b .ooo85429.sw.a11ycrash.patch
-%patch61 -p1 -b .ooo85448.emptyrpath.patch
-%patch62 -p1 -b .workspace.cairotext01.patch
-%patch63 -p1 -b .ooo85854.sw.graphicsaveas.patch
-%patch64 -p1 -b .ooo85921.sd.editmasterundermouse.patch
-%patch65 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch66 -p1 -b .ooo86268.desktop.visibilitycockup.patch
-%patch67 -p1 -b .oooXXXXX.psprint.debugcups.patch
-%patch68 -p1 -b .workspace.cmcfixes43.patch
-%patch69 -p1 -b .ooo86588.sw.buildfix.patch
-%patch70 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
-%patch71 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch
+%patch56 -p1 -b .ooo85097.desktop.pagein.patch
+%patch57 -p1
+%patch58 -p1 -b .rh133741.alwaysgtk.vcl.patch
+%patch59 -p1 -b .ooo85429.sw.a11ycrash.patch
+%patch60 -p1 -b .ooo85448.emptyrpath.patch
+%patch61 -p1 -b .workspace.cairotext01.patch
+%patch62 -p1 -b .ooo85854.sw.graphicsaveas.patch
+%patch63 -p1 -b .ooo85921.sd.editmasterundermouse.patch
+%patch64 -p1 -b .ooo86080.unopkg.bodge.patch
+%patch65 -p1 -b .oooXXXXX.psprint.debugcups.patch
+%patch66 -p1 -b .workspace.cmcfixes43.patch
+%patch67 -p1 -b .ooo86588.sw.buildfix.patch
+%patch68 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
+%patch69 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2879,6 +2874,7 @@
 - drop integrated workspace.gcc430two.patch
 - drop integrated openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch
 - drop integrated openoffice.org-2.4.0.ooo86123.ucb.newneon.patch
+- drop subsumed openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch
 - add workspace.cmcfixes43.patch
 - add openoffice.org-3.0.0.ooo86588.sw.buildfix.patch
 

workspace.cmcfixes43.patch:

Index: workspace.cmcfixes43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/Attic/workspace.cmcfixes43.patch,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- workspace.cmcfixes43.patch	10 Mar 2008 13:35:57 -0000	1.1.2.4
+++ workspace.cmcfixes43.patch	10 Mar 2008 19:57:24 -0000	1.1.2.5
@@ -294,16 +294,6 @@
 +    local:
 +        *;
 +};
-Index: sc/scext/prj/build.lst
-diff -u sc/scext/prj/build.lst:1.4 sc/scext/prj/build.lst:1.4.2.1
---- sc/scext/prj/build.lst:1.4	Mon Feb 11 00:55:26 2008
-+++ sc/scext/prj/build.lst	Mon Mar 10 05:19:15 2008
-@@ -1,4 +1,4 @@
--scx	scext	:	offuh comphelper lpsolve tools transex3 rsc NULL
-+scx	scext	:	offuh comphelper LPSOLVE:lpsolve tools transex3 rsc NULL
- scx	scext									usr1	-	all	scx_mkout NULL
- scx	scext\prj								get		-	all	scx_prj NULL
- scx	scext\source\solver						nmake	-	all	scx_solver NULL
 Index: porting/sal/qa/rtl/textenc/gcc3_export.map
 diff -u /dev/null porting/sal/qa/rtl/textenc/gcc3_export.map:1.1.2.1
 --- /dev/null	Mon Mar 10 06:32:58 2008


--- openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch DELETED ---

More information about the fedora-extras-commits mailing list