Mon May 19 12:05:49 UTC 2008

Author: caolanm

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

Modified Files:
	openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch 
	openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch 
	openoffice.org.spec pseudoworkspace.valgrind1.patch 
Removed Files:
	openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch 
	openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch 
	openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch 
	openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch 
	openoffice.org-3.0.0.ooo87991.fpickersafe.patch 
	openoffice.org-3.0.0.ooo88584.sdext.extraqual.patch 
	workspace.ucpgio1.patch 
Log Message:
next version

openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch:

Index: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch	8 Jan 2008 14:51:51 -0000	1.2
+++ openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch	19 May 2008 12:05:02 -0000	1.3
@@ -111,7 +111,7 @@
 diff -u -r1.9 Configuration.xcu
 --- openoffice.org.orig/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu	8 Sep 2005 15:07:17 -0000	1.9
 +++ openoffice.org/officecfg/registry/data/org/openoffice/ucb/Configuration.xcu	7 Dec 2007 08:46:39 -0000
-@@ -106,6 +106,17 @@
+@@ -101,6 +101,17 @@
                  <value/>
                </prop>
              </node>
@@ -129,7 +129,7 @@
              <node oor:name="Provider8" oor:op="replace">
                <prop oor:name="ServiceName">
                  <value>com.sun.star.ucb.PackageContentProvider</value>
-@@ -161,6 +172,17 @@
+@@ -156,6 +167,17 @@
  			    <value/>
  			  </prop>
  			</node>
@@ -144,6 +144,6 @@
 +                <value/>
 +              </prop>
 +            </node>
- 		  </node>
-         </node>
-       </node>
+             <!-- We want the Provider to be the final fallback provider -->
+             <node oor:name="Provider999" oor:op="replace" install:module="gio">
+               <prop oor:name="ServiceName">

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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch	27 Mar 2008 15:13:51 -0000	1.4
+++ openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch	19 May 2008 12:05:02 -0000	1.5
@@ -1,6 +1,6 @@
 --- 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
-@@ -51,6 +51,29 @@
+@@ -47,6 +47,29 @@
  sd_prog=`pwd`
  cd "$sd_cwd"
  
@@ -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 $@
-@@ -84,5 +107,7 @@
- [ $# -eq 1 -a "oxt" = "`echo $1 | cut -d . -f 2`" -a -n "$DISPLAY" ] && GUI="gui"
+@@ -76,5 +99,7 @@
+ export PATH
  
  # execute binary
--exec "$sd_prog/unopkg.bin" $GUI "$@" "-env:INIFILEPATH=$sd_prog/redirectrc"
+-exec "$sd_prog/unopkg.bin" "$@" "-env:INIFILEPATH=$sd_prog/redirectrc"
 -
-+"$sd_prog/unopkg.bin" $GUI "$@" "-env:INIFILEPATH=$sd_prog/redirectrc"
++"$sd_prog/unopkg.bin" "$@" "-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.1504
retrieving revision 1.1505
diff -u -r1.1504 -r1.1505
--- openoffice.org.spec	16 May 2008 16:00:40 -0000	1.1504
+++ openoffice.org.spec	19 May 2008 12:05:02 -0000	1.1505
@@ -1,6 +1,6 @@
 %define oootag DEV300
-%define ooomilestone 12
-%define rh_rpm_release 2
+%define ooomilestone 13
+%define rh_rpm_release 1
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -102,39 +102,32 @@
 Patch28: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
 Patch29: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
 Patch30: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch31: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
-Patch32: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
-Patch33: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
-Patch34: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
-Patch35: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
-Patch36: openoffice.org-2.3.0.ooo76649.httpencoding.patch
-Patch37: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch38: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
-Patch39: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
-Patch40: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
-Patch41: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
-Patch42: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch43: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
-Patch44: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
-Patch45: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
-Patch46: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
-Patch47: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch48: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
-Patch49: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
-Patch50: openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
-Patch51: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
-Patch52: openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
-Patch53: openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
-Patch54: openoffice.org-3.0.0.ooo87991.fpickersafe.patch
-Patch55: openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch
-Patch56: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
-Patch57: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch58: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
-Patch59: workspace.ucpgio1.patch
-Patch60: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
-Patch61: openoffice.org-3.0.0.ooo88584.sdext.extraqual.patch
-Patch62: openoffice.org-3.0.0.ooo89172.filter.string.patch
-Patch63: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch31: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
+Patch32: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
+Patch33: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
+Patch34: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
+Patch35: openoffice.org-2.3.0.ooo76649.httpencoding.patch
+Patch36: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
+Patch37: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
+Patch38: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
+Patch39: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
+Patch40: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
+Patch41: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
+Patch42: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
+Patch43: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
+Patch44: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
+Patch45: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
+Patch46: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+Patch47: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
+Patch48: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
+Patch49: openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
+Patch50: openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch
+Patch51: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
+Patch52: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
+Patch53: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
+Patch54: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
+Patch55: openoffice.org-3.0.0.ooo89172.filter.string.patch
+Patch56: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1228,39 +1221,32 @@
 %patch28 -p0 -b .ooo68717.gstreamer.video.patch
 %patch29 -p1 -b .ooo63159.sal.dtype.patch
 %patch30 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch31 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
-%patch32 -p1 -b .ooo80816.selinux.bridges.patch
-%patch33 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
-%patch34 -p1 -b .ooo80257.sd.textonlystyle.patch
-tar xzf %{PATCH35}
-%patch36 -p1 -b .ooo76649.httpencoding.patch
-%patch37 -p1 -b .ooo83878.unopkg.enablelinking.patch
-%patch38 -p1 -b .ooo84676.ucb.davprotocol.patch
-%patch39 -p1 -b .ooo84621.sw.insertexcel.patch
-%patch40 -p1 -b .ooo85097.desktop.pagein.patch
-%patch41 -p1
-%patch42 -p1 -b .rh133741.alwaysgtk.vcl.patch
-%patch43 -p1 -b .ooo85429.sw.a11ycrash.patch
-%patch44 -p1 -b .ooo85448.emptyrpath.patch
-%patch45 -p1 -b .ooo85854.sw.graphicsaveas.patch
-%patch46 -p1 -b .ooo85921.sd.editmasterundermouse.patch
-%patch47 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch48 -p1 -b .oooXXXXX.psprint.debugcups.patch
-%patch49 -p1 -b .ooo86924.sfx2.iconchanges.patch
-%patch50 -p1 -b .ooo87204.toolkit.64bitevent.patch
-%patch51 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
-%patch52 -p1 -b .ooo87604.fixupsystemhunspell.patch
-%patch53 -p1 -b .ooo85691.vcl.tooltipcolor.patch
-%patch54 -p1 -b .ooo87991.fpickersafe.patch
-%patch55 -p1 -b .ooo88260.decl-defi-mismatch.patch
-%patch56 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
-%patch57 -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch58 -p1 -b .ooo6087.sc.sheetnames.patch
-%patch59 -p1 -b .workspace.ucpgio1.patch
-%patch60 -p1 -b .ooo89002.vcl.symbolfonts.patch
-%patch61 -p1 -b .ooo88584.sdext.extraqual.patch
-%patch62 -p1 -b .ooo89172.filter.string.patch
-%patch63 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch31 -p1 -b .ooo80816.selinux.bridges.patch
+%patch32 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
+%patch33 -p1 -b .ooo80257.sd.textonlystyle.patch
+tar xzf %{PATCH34}
+%patch35 -p1 -b .ooo76649.httpencoding.patch
+%patch36 -p1 -b .ooo83878.unopkg.enablelinking.patch
+%patch37 -p1 -b .ooo84676.ucb.davprotocol.patch
+%patch38 -p1 -b .ooo84621.sw.insertexcel.patch
+%patch39 -p1 -b .ooo85097.desktop.pagein.patch
+%patch40 -p1
+%patch41 -p1 -b .rh133741.alwaysgtk.vcl.patch
+%patch42 -p1 -b .ooo85429.sw.a11ycrash.patch
+%patch43 -p1 -b .ooo85448.emptyrpath.patch
+%patch44 -p1 -b .ooo85854.sw.graphicsaveas.patch
+%patch45 -p1 -b .ooo85921.sd.editmasterundermouse.patch
+%patch46 -p1 -b .ooo86080.unopkg.bodge.patch
+%patch47 -p1 -b .oooXXXXX.psprint.debugcups.patch
+%patch48 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
+%patch49 -p1 -b .ooo87604.fixupsystemhunspell.patch
+%patch50 -p1 -b .ooo88260.decl-defi-mismatch.patch
+%patch51 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
+%patch52 -p1 -b .ooo88341.sc.verticalboxes.patch
+%patch53 -p1 -b .ooo6087.sc.sheetnames.patch
+%patch54 -p1 -b .ooo89002.vcl.symbolfonts.patch
+%patch55 -p1 -b .ooo89172.filter.string.patch
+%patch56 -p1 -b .gccXXXXX.solenv.javaregistration.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3383,6 +3369,16 @@
 %{python_py_sitearch}/unohelper.py*
 
 %changelog
+* Mon May 19 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.13-1
+- next version
+- drop integrated openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
+- drop integrated openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
+- drop integrated openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
+- drop integrated openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
+- drop integrated openoffice.org-3.0.0.ooo87991.fpickersafe.patch
+- drop integrated workspace.ucpgio1.patch
+- drop integrated openoffice.org-3.0.0.ooo88584.sdext.extraqual.patch
+
 * Fri May 16 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.12.2
 - I misspelled the damn Requires
 

pseudoworkspace.valgrind1.patch:

Index: pseudoworkspace.valgrind1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/pseudoworkspace.valgrind1.patch,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- pseudoworkspace.valgrind1.patch	4 May 2008 11:33:06 -0000	1.33
+++ pseudoworkspace.valgrind1.patch	19 May 2008 12:05:02 -0000	1.34
@@ -66,19 +66,3 @@
  {
  	DBG_TRACE1( "VirtualDevice::VirtualDevice( %hu )", nBitCount );
  
-Index: source/glyphs/gcach_rbmp.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/source/glyphs/gcach_rbmp.cxx,v
-retrieving revision 1.8
-diff -u -r1.8 gcach_rbmp.cxx
---- openoffice.org.orig/vcl/source/glyphs/gcach_rbmp.cxx	27 Jun 2007 20:25:11 -0000	1.8
-+++ openoffice.org/vcl/source/glyphs/gcach_rbmp.cxx	7 Apr 2008 10:52:55 -0000
-@@ -160,7 +160,7 @@
-                 nTemp = 1;
-             }
-             // update input byte if needed
--            if( (nInp >>= 1) <= 1 )
-+            if( ( (nInp >>= 1) <= 1 ) && (!(y == 0 && x == 0)) )
-                 nInp = 0x100 + *(--p2);
-         }
- 


--- openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch DELETED ---


--- openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch DELETED ---


--- openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch DELETED ---


--- openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch DELETED ---


--- openoffice.org-3.0.0.ooo87991.fpickersafe.patch DELETED ---


--- openoffice.org-3.0.0.ooo88584.sdext.extraqual.patch DELETED ---


--- workspace.ucpgio1.patch DELETED ---


