Sat Mar 22 17:27:22 UTC 2008

Author: caolanm

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

Modified Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	.cvsignore 
	openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch 
	openoffice.org-2.2.0.rh232389.tango.patch 
	openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch 
	openoffice.org.spec pseudoworkspace.valgrind1.patch sources 
Removed Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org-1.9.114.rh161886.rpath.desktop.patch 
	openoffice.org-2.3.1.ooo81307.sw.word2.patch 
Log Message:
m4


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.150.2.4
retrieving revision 1.150.2.5
diff -u -r1.150.2.4 -r1.150.2.5

--- .cvsignore	15 Mar 2008 13:41:28 -0000	1.150.2.4
+++ .cvsignore	22 Mar 2008 17:26:12 -0000	1.150.2.5
@@ -5,3 +5,4 @@
 unowinreg.dll
 bengali.sdf
 DEV300_m3.tar.bz2
+DEV300_m4.tar.bz2

openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch:

Index: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch	12 Oct 2007 06:25:27 -0000	1.7
+++ openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch	22 Mar 2008 17:26:12 -0000	1.7.2.1
@@ -1,6 +1,6 @@
 --- SRC680_m123/desktop/scripts/soffice.sh.orig	2005-08-15 20:17:35.000000000 +0100
 +++ SRC680_m123/desktop/scripts/soffice.sh	2005-08-15 20:19:36.000000000 +0100
-@@ -194,23 +194,22 @@ unset XENVIRONMENT
+@@ -92,23 +92,22 @@
  # uncomment line below to disable anti aliasing of fonts
  # SAL_ANTIALIAS_DISABLE=true; export SAL_ANTIALIAS_DISABLE
  
@@ -28,16 +28,17 @@
          break;
          ;;
      *)
-@@ -218,9 +217,6 @@ for sd_arg in ${1+"$@"} ; do
-     esac
- done
+@@ -121,10 +120,6 @@
+   . /etc/adabasrc
+ fi
  
 -sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-common"
--"${sd_prog}"/pagein -L"${sd_prog}" ${sd_pagein_args}
+-"$sd_prog/../basis-link/program/pagein" -L"$sd_prog/../basis-link/program" \
+-    ${sd_pagein_args}
 -
- # set path so that other apps can be started from soffice just by name
- if [ $PATH ]; then
-   PATH="$sd_prog":$PATH
+ # Set PATH so that crash_report is found:
+ PATH=$sd_prog${PATH+:$PATH}
+ export PATH
 Index: osl/unx/signal.c
 ===================================================================
 RCS file: /cvs/porting/sal/osl/unx/signal.c,v

openoffice.org-2.2.0.rh232389.tango.patch:

Index: openoffice.org-2.2.0.rh232389.tango.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.0.rh232389.tango.patch,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- openoffice.org-2.2.0.rh232389.tango.patch	15 Mar 2008 13:41:28 -0000	1.5.2.1
+++ openoffice.org-2.2.0.rh232389.tango.patch	22 Mar 2008 17:26:12 -0000	1.5.2.2
@@ -157,22 +157,6 @@
              < "Crystal" ; > ;
              < "Tango" ; > ;
          };
-Index: inc/settings.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/settings.mk,v
-retrieving revision 1.205.32.2
-diff -u -r1.205.32.2 settings.mk
---- openoffice.org.orig/solenv/inc/settings.mk	16 Jan 2007 08:33:58 -0000	1.205.32.2
-+++ openoffice.org/solenv/inc/settings.mk	30 Mar 2007 14:36:30 -0000
-@@ -946,7 +946,7 @@
- .ENDIF
- 
- # additional image sets
--CUSTOM_IMAGE_SETS=hicontrast industrial crystal tango
-+CUSTOM_IMAGE_SETS=hicontrast crystal tango
- 
- # settings for mozilla idl compiler
- XPIDL=xpidl
 Index: inc/bf_svtools/imgdef.hxx
 ===================================================================
 RCS file: /cvs/framework/binfilter/inc/bf_svtools/imgdef.hxx,v

openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch:

Index: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch	12 Mar 2008 16:40:53 -0000	1.1.2.2
+++ openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch	22 Mar 2008 17:26:12 -0000	1.1.2.3
@@ -1,8 +1,8 @@
 --- openoffice.org.orig/desktop/scripts/unopkg.sh	2008-01-14 15:55:26.000000000 +0000
 +++ openoffice.org/desktop/scripts/unopkg.sh	2008-02-14 10:52:10.000000000 +0000
-@@ -95,6 +95,29 @@
-     ;;
- esac
+@@ -51,6 +51,29 @@
+ sd_prog=`pwd`
+ cd "$sd_cwd"
  
 +isshared=0
 +for arg in $@
@@ -30,13 +30,13 @@
  #collect all bootstrap variables specified on the command line
  #so that they can be passed as arguments to javaldx later on
  for arg in $@
-@@ -149,5 +172,8 @@
+@@ -84,5 +107,7 @@
  [ $# -eq 1 -a "oxt" = "`echo $1 | cut -d . -f 2`" -a -n "$DISPLAY" ] && GUI="gui"
  
  # execute binary
--exec "$sd_prog/$sd_binary" $GUI "$@"
-+"$sd_prog/$sd_binary" $GUI "$@"
- 
+-exec "$sd_prog/unopkg.bin" $GUI "$@" "-env:INIFILEPATH=$sd_prog/redirectrc"
+-
++"$sd_prog/unopkg.bin" $GUI "$@" "-env:INIFILEPATH=$sd_prog/redirectrc"
 +if [ -n "$INSTDIR" ]; then
 +   rm -rf $INSTDIR
 +fi


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440.2.28
retrieving revision 1.1440.2.29
diff -u -r1.1440.2.28 -r1.1440.2.29
--- openoffice.org.spec	19 Mar 2008 13:03:27 -0000	1.1440.2.28
+++ openoffice.org.spec	22 Mar 2008 17:26:12 -0000	1.1440.2.29
@@ -1,5 +1,5 @@
 %define oootag DEV300
-%define ooomilestone 3
+%define ooomilestone 4
 %define rh_rpm_release 1
 
 # undef to get english only and no-langpacks for a faster smoketest build
@@ -79,66 +79,64 @@
 Patch8:  openoffice.org.langpack-common.template
 Patch9:  openoffice.org.langpack-acor.template
 Patch10: openoffice.org.langpack-ctl.template
-Patch11: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
-Patch12: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
+Patch11: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
 %if %{gtkprintui}
-Patch13: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
+Patch12: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
 %endif
-Patch14: openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch
-Patch15: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
-Patch16: openoffice.org-1.9.115.ooo69368.fixxmlsec.patch
-Patch17: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch18: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch19: openoffice.org-2.0.2.rh188467.printingdefaults.patch
-Patch20: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch21: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
-Patch22: pseudoworkspace.valgrind1.patch
-Patch23: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch24: openoffice.org-2.0.4.rh217065.syncbackspace.patch
-Patch25: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
-Patch26: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
-Patch27: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
-Patch28: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch
-Patch29: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
-Patch30: workspace.tl37.patch
-Patch31: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
-Patch32: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
-Patch33: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
-Patch34: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch35: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
-Patch36: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch37: openoffice.org-2.2.0.rh232389.tango.patch
-Patch38: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch39: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
-Patch40: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
-Patch41: openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
-Patch42: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
-Patch43: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
-Patch44: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
-Patch45: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
-Patch46: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch47: openoffice.org-2.3.0.ooo76649.httpencoding.patch
-Patch48: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
-Patch49: openoffice.org-2.3.1.ooo81307.sw.word2.patch
-Patch50: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch51: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
-Patch52: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
-Patch53: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
-Patch54: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
-Patch55: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
-Patch56: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch57: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
-Patch58: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
-Patch59: workspace.cairotext01.patch
-Patch60: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
-Patch61: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
-Patch62: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch63: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
-Patch64: workspace.cmcfixes43.patch
-Patch65: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
-Patch66: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
-Patch67: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
-Patch68: openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
+Patch13: openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch
+Patch14: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
+Patch15: openoffice.org-1.9.115.ooo69368.fixxmlsec.patch
+Patch16: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch17: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch18: openoffice.org-2.0.2.rh188467.printingdefaults.patch
+Patch19: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch20: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
+Patch21: pseudoworkspace.valgrind1.patch
+Patch22: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch23: openoffice.org-2.0.4.rh217065.syncbackspace.patch
+Patch24: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
+Patch25: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch26: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch27: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch
+Patch28: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
+Patch29: workspace.tl37.patch
+Patch30: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
+Patch31: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
+Patch32: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
+Patch33: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch34: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
+Patch35: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
+Patch36: openoffice.org-2.2.0.rh232389.tango.patch
+Patch37: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
+Patch38: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
+Patch39: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
+Patch40: openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
+Patch41: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
+Patch42: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
+Patch43: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
+Patch44: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
+Patch45: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch46: openoffice.org-2.3.0.ooo76649.httpencoding.patch
+Patch47: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
+Patch48: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
+Patch49: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
+Patch50: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
+Patch51: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
+Patch52: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
+Patch53: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
+Patch54: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
+Patch55: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
+Patch56: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
+Patch57: workspace.cairotext01.patch
+Patch58: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
+Patch59: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
+Patch60: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+Patch61: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
+Patch62: workspace.cmcfixes43.patch
+Patch63: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
+Patch64: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
+Patch65: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
+Patch66: openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
 
 %define instdir %{_libdir}/openoffice.org
 %define OFFICEUPD 300
@@ -1045,66 +1043,64 @@
  tail -n 1 extras/source/palettes/standard.soc) > redhat.soc
 mv -f redhat.soc extras/source/palettes/standard.soc
 cp -p %{SOURCE6} external/unowinreg/unowinreg.dll
-%patch11 -p1 -b .rh161886.rpath.desktop.patch
-%patch12 -p1 -b .rh151357.setlangtolocale.patch
+%patch11 -p1 -b .rh151357.setlangtolocale.patch
 %if %{gtkprintui}
-%patch13 -p1 -b .rh127576.gtkunixprintdialog.patch
+%patch12 -p1 -b .rh127576.gtkunixprintdialog.patch
 %endif
-%patch14 -p1 -b .rh171692.jvmfwk.retryjvm.patch
-%patch15 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
-%patch16 -p1 -b .ooo69368.fixxmlsec.patch
-%patch17 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch18 -p1 -b .ooo58606.sw.pre-edit.patch
-%patch19 -p1
-%patch20 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch21 -p1 -b .ooo69051.vcl.singlekeypress.patch
-%patch22 -p1 -b .pseudoworkspace.valgrind1.patch
-%patch23 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch24 -p1 -b .rh217065.syncbackspace.patch
-%patch25 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
-%patch26 -p1 -b .ooo65491.psprint.enablenups.patch
-cat %{PATCH27} >> svtools/source/dialogs/localize.sdf
-%patch28 -p1 -b .oooXXXXX.lingucomponent.systemdicts.patch
-%patch29 -p1 -b .rh217269.officecfg.nosequencecheck.patch
-%patch30 -p1 -b .tl37.patch
-%patch31 -p1 -b .ooo73201.sw.a11yloadcrash.patch
-%patch32 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
-%patch33 -p1 -b .ooo73863.vcl.imcommit.patch
-%patch34 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch35 -p0 -b .ooo68717.gstreamer.video.patch
-%patch36 -p1 -b .ooo63159.sal.dtype.patch
-%patch37 -p1 -b .rh232389.tango.patch
-%patch38 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch39 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
-%patch40 -p1 -b .ooo80816.selinux.bridges.patch
-%patch41 -p1 -b .ooo78971.xmloff.outofrange.patch
-%patch42 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
-%patch43 -p1 -b .ooo79481.sw.rowordcount.patch
-%patch44 -p1 -b .ooo80257.sd.textonlystyle.patch
-tar xzf %{PATCH45}
-%patch46 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch47 -p1 -b .ooo76649.httpencoding.patc
-%patch48 -p1 -b .ooo82966.svx.missing3d.patch
-%patch49 -p1 -b .ooo81307.sw.word2.patch
-%patch50 -p1 -b .ooo83878.unopkg.enablelinking.patch
-%patch51 -p1 -b .ooo84676.ucb.davprotocol.patch
-%patch52 -p1 -b .ooo84621.sw.insertexcel.patch
-%patch53 -p1 -b .ooo85054.stlport.noorigs.patch
-%patch54 -p1 -b .ooo85097.desktop.pagein.patch
-%patch55 -p1
-%patch56 -p1 -b .rh133741.alwaysgtk.vcl.patch
-%patch57 -p1 -b .ooo85429.sw.a11ycrash.patch
-%patch58 -p1 -b .ooo85448.emptyrpath.patch
-%patch59 -p1 -b .workspace.cairotext01.patch
-%patch60 -p1 -b .ooo85854.sw.graphicsaveas.patch
-%patch61 -p1 -b .ooo85921.sd.editmasterundermouse.patch
-%patch62 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch63 -p1 -b .oooXXXXX.psprint.debugcups.patch
-%patch64 -p1 -b .workspace.cmcfixes43.patch
-%patch65 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
-%patch66 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch
-%patch67 -p1 -b .ooo86924.sfx2.iconchanges.patch
-%patch68 -p1 -b .ooo87204.toolkit.64bitevent.patch
+%patch13 -p1 -b .rh171692.jvmfwk.retryjvm.patch
+%patch14 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
+%patch15 -p1 -b .ooo69368.fixxmlsec.patch
+%patch16 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch17 -p1 -b .ooo58606.sw.pre-edit.patch
+%patch18 -p1
+%patch19 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch20 -p1 -b .ooo69051.vcl.singlekeypress.patch
+%patch21 -p1 -b .pseudoworkspace.valgrind1.patch
+%patch22 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch23 -p1 -b .rh217065.syncbackspace.patch
+%patch24 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
+%patch25 -p1 -b .ooo65491.psprint.enablenups.patch
+cat %{PATCH26} >> svtools/source/dialogs/localize.sdf
+%patch27 -p1 -b .oooXXXXX.lingucomponent.systemdicts.patch
+%patch28 -p1 -b .rh217269.officecfg.nosequencecheck.patch
+%patch29 -p1 -b .tl37.patch
+%patch30 -p1 -b .ooo73201.sw.a11yloadcrash.patch
+%patch31 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
+%patch32 -p1 -b .ooo73863.vcl.imcommit.patch
+%patch33 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
+%patch34 -p0 -b .ooo68717.gstreamer.video.patch
+%patch35 -p1 -b .ooo63159.sal.dtype.patch
+%patch36 -p1 -b .rh232389.tango.patch
+%patch37 -p1 -b .ooo76393.sal.dynamicsection.patch
+%patch38 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
+%patch39 -p1 -b .ooo80816.selinux.bridges.patch
+%patch40 -p1 -b .ooo78971.xmloff.outofrange.patch
+%patch41 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
+%patch42 -p1 -b .ooo79481.sw.rowordcount.patch
+%patch43 -p1 -b .ooo80257.sd.textonlystyle.patch
+tar xzf %{PATCH44}
+%patch45 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch46 -p1 -b .ooo76649.httpencoding.patc
+%patch47 -p1 -b .ooo82966.svx.missing3d.patch
+%patch48 -p1 -b .ooo83878.unopkg.enablelinking.patch
+%patch49 -p1 -b .ooo84676.ucb.davprotocol.patch
+%patch50 -p1 -b .ooo84621.sw.insertexcel.patch
+%patch51 -p1 -b .ooo85054.stlport.noorigs.patch
+%patch52 -p1 -b .ooo85097.desktop.pagein.patch
+%patch53 -p1
+%patch54 -p1 -b .rh133741.alwaysgtk.vcl.patch
+%patch55 -p1 -b .ooo85429.sw.a11ycrash.patch
+%patch56 -p1 -b .ooo85448.emptyrpath.patch
+%patch57 -p1 -b .workspace.cairotext01.patch
+%patch58 -p1 -b .ooo85854.sw.graphicsaveas.patch
+%patch59 -p1 -b .ooo85921.sd.editmasterundermouse.patch
+%patch60 -p1 -b .ooo86080.unopkg.bodge.patch
+%patch61 -p1 -b .oooXXXXX.psprint.debugcups.patch
+%patch62 -p1 -b .workspace.cmcfixes43.patch
+%patch63 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
+%patch64 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch
+%patch65 -p1 -b .ooo86924.sfx2.iconchanges.patch
+%patch66 -p1 -b .ooo87204.toolkit.64bitevent.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2920,7 +2916,7 @@
 %{python_py_sitearch}/unohelper.py*
 
 %changelog
-* Fri Mar 13 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.3.1
+* Sat Mar 22 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.4.1
 - extend selinux bodge to ia64 
 - drop integrated workspace.notes2.patch
 - drop integrated openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch
@@ -2931,6 +2927,8 @@
 - drop subsumed openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch
 - drop integrated workspace.unifysound01.patch
 - drop openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
+- drop integrated openoffice.org-1.9.114.rh161886.rpath.desktop.patch
+- drop integrated openoffice.org-2.3.1.ooo81307.sw.word2.patch
 - add workspace.cmcfixes43.patch
 - add the report-builder
 

pseudoworkspace.valgrind1.patch:

Index: pseudoworkspace.valgrind1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/pseudoworkspace.valgrind1.patch,v
retrieving revision 1.27.2.2
retrieving revision 1.27.2.3
diff -u -r1.27.2.2 -r1.27.2.3
--- pseudoworkspace.valgrind1.patch	8 Mar 2008 20:52:05 -0000	1.27.2.2
+++ pseudoworkspace.valgrind1.patch	22 Mar 2008 17:26:12 -0000	1.27.2.3
@@ -1,34 +1,3 @@
-Index: source/ui/dialog/SwSpellDialogChildWindow.cxx
-===================================================================
-RCS file: /cvs/sw/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx,v
-retrieving revision 1.11
-diff -u -r1.11 SwSpellDialogChildWindow.cxx
---- openoffice.org.orig/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx	27 Sep 2007 11:36:02 -0000	1.11
-+++ openoffice.org/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx	18 Jan 2008 14:04:49 -0000
-@@ -162,6 +162,7 @@
-     SpellState() :
-         m_bInitialCall(true),
-         m_bLockFocus(false),
-+	m_bLostFocus(false),
-         m_SpellStartPosition(SPELL_START_BODY),
-         m_bBodySpelled(false),
-         m_bOtherSpelled(false),
-Index: source/core/unocore/unoframe.cxx
-===================================================================
-RCS file: /cvs/sw/sw/source/core/unocore/unoframe.cxx,v
-retrieving revision 1.115
-diff -u -r1.115 unoframe.cxx
---- openoffice.org.orig/sw/source/core/unocore/unoframe.cxx	5 Nov 2007 07:39:59 -0000	1.115
-+++ openoffice.org/sw/source/core/unocore/unoframe.cxx	18 Jan 2008 17:32:52 -0000
-@@ -802,7 +802,7 @@
- {
- 	if(pHEvenMirror || pHOddMirror || pVMirror )
- 	{
--		SwMirrorGrf aMirror ( static_cast < const SwMirrorGrf& > ( rFromSet.Get ( RES_FRM_SIZE ) ) );
-+		SwMirrorGrf aMirror ( static_cast < const SwMirrorGrf& > ( rFromSet.Get ( RES_GRFATR_MIRRORGRF ) ) );
- 		if(pHEvenMirror)
- 			rRet &= ((SfxPoolItem&)aMirror).PutValue(*pHEvenMirror, MID_MIRROR_HORZ_EVEN_PAGES);
- 		if(pHOddMirror)
 Index: source/svxlink/linkmgr.cxx
 ===================================================================
 RCS file: /cvs/graphics/svx/source/svxlink/linkmgr.cxx,v


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.273.2.3
retrieving revision 1.273.2.4
diff -u -r1.273.2.3 -r1.273.2.4
--- sources	15 Mar 2008 13:41:28 -0000	1.273.2.3
+++ sources	22 Mar 2008 17:26:12 -0000	1.273.2.4
@@ -4,4 +4,4 @@
 e3a0b76dcd876f3d721ee7183729153d  unowinreg.dll
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
 0c0e868b34329d90a7c9a92f1704775c  bengali.sdf
-3c11eeb7859d8c917a163fa82a427bb1  DEV300_m3.tar.bz2
+8d7ec80f34cceeda8b0863ea8e6373dd  DEV300_m4.tar.bz2


--- openoffice.org-1.9.114.rh161886.rpath.desktop.patch DELETED ---


--- openoffice.org-2.3.1.ooo81307.sw.word2.patch DELETED ---


