rpms/openoffice.org/F-9 openoffice.org.spec, 1.1487, 1.1488 pseudoworkspace.valgrind1.patch, 1.31, 1.32 workspace.notes2.patch, 1.12, 1.13 workspace.unifysound01.patch, 1.11, 1.12 openoffice.org-2.3.1.ooo81307.sw.word2.patch, 1.2, NONE workspace.os114.patch, 1.1, NONE
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Sun Jun 1 22:30:18 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4388
Modified Files:
openoffice.org.spec pseudoworkspace.valgrind1.patch
workspace.notes2.patch workspace.unifysound01.patch
Removed Files:
openoffice.org-2.3.1.ooo81307.sw.word2.patch
workspace.os114.patch
Log Message:
2.4.1
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org.spec,v
retrieving revision 1.1487
retrieving revision 1.1488
diff -u -r1.1487 -r1.1488
--- openoffice.org.spec 26 May 2008 16:00:03 -0000 1.1487
+++ openoffice.org.spec 1 Jun 2008 22:29:25 -0000 1.1488
@@ -1,6 +1,6 @@
%define oootag OOH680
-%define ooomilestone 12
-%define rh_rpm_release 11
+%define ooomilestone 17
+%define rh_rpm_release 1
# undef to get english only and no-langpacks for a faster smoketest build
%define langpacks 1
@@ -42,7 +42,7 @@
Summary: OpenOffice.org comprehensive office suite.
Name: openoffice.org
-Version: 2.4.0
+Version: 2.4.1
Release: %{ooomilestone}.%{rh_rpm_release}%{?dist}
Epoch: 1
License: LGPLv2 and LGPLv2+ and MPLv1.1 and BSD
@@ -121,43 +121,41 @@
Patch48: openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
Patch49: openoffice.org-2.3.0.ooo76649.httpencoding.patch
Patch50: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
-Patch51: openoffice.org-2.3.1.ooo81307.sw.word2.patch
-Patch52: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch53: workspace.notes2.patch
-Patch54: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
-Patch55: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
-Patch56: openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch
-Patch57: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
-Patch58: openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch
-Patch59: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
-Patch60: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
-Patch61: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch62: openoffice.org-2.4.0.ooo85385.svtools.a11ycrash.patch
-Patch63: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
-Patch64: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
-Patch65: workspace.cairotext01.patch
-Patch66: workspace.gcc430two.patch
-Patch67: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
-Patch68: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
-Patch69: openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch
-Patch70: openoffice.org-2.4.0.ooo86123.ucb.newneon.patch
-Patch71: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch72: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
-Patch73: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
-Patch74: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
-Patch75: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
-Patch76: openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
-Patch77: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
-Patch78: openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
-Patch79: openoffice.org-3.0.0.ooo87991.fpickersafe.patch
-Patch80: openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch
-Patch81: openoffice.org-2.4.0.ooo87071.sd.backgroundfix.patch
-Patch82: openoffice.org-3.0.0.ooo88090.chart2.negativecount.patch
-Patch83: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
-Patch84: workspace.os114.patch
-Patch85: workspace.impress138.patch
-Patch86: openoffice.org-2.4.0.gcc36187.noaliasingbusted.patch
-Patch87: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
+Patch51: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
+Patch52: workspace.notes2.patch
+Patch53: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
+Patch54: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
+Patch55: openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch
+Patch56: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
+Patch57: openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch
+Patch58: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
+Patch59: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
+Patch60: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
+Patch61: openoffice.org-2.4.0.ooo85385.svtools.a11ycrash.patch
+Patch62: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
+Patch63: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
+Patch64: workspace.cairotext01.patch
+Patch65: workspace.gcc430two.patch
+Patch66: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
+Patch67: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
+Patch68: openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch
+Patch69: openoffice.org-2.4.0.ooo86123.ucb.newneon.patch
+Patch70: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+Patch71: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
+Patch72: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
+Patch73: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
+Patch74: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
+Patch75: openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
+Patch76: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
+Patch77: openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
+Patch78: openoffice.org-3.0.0.ooo87991.fpickersafe.patch
+Patch79: openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch
+Patch80: openoffice.org-2.4.0.ooo87071.sd.backgroundfix.patch
+Patch81: openoffice.org-3.0.0.ooo88090.chart2.negativecount.patch
+Patch82: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
+Patch83: workspace.impress138.patch
+Patch84: openoffice.org-2.4.0.gcc36187.noaliasingbusted.patch
+Patch85: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
%define instdir %{_libdir}/openoffice.org
@@ -1093,43 +1091,41 @@
%patch48 -p1 -b .ooo81321.cppu.silencewarnings.patch
%patch49 -p1 -b .ooo76649.httpencoding.patc
%patch50 -p1 -b .ooo82966.svx.missing3d.patch
-%patch51 -p1 -b .ooo81307.sw.word2.patch
-%patch52 -p1 -b .ooo83878.unopkg.enablelinking.patch
-%patch53 -p1 -b .workspace.notes2.patch
-%patch54 -p1 -b .ooo84676.ucb.davprotocol.patch
-%patch55 -p1 -b .ooo84621.sw.insertexcel.patch
-%patch56 -p1 -b .ooo84770.svx.eventsmismatch.patch
-%patch57 -p1 -b .ooo85054.stlport.noorigs.patch
-%patch58 -p1 -b .ooo86670.config_office.xpcomasxul.patch
-%patch59 -p1 -b .ooo85097.desktop.pagein.patch
-%patch60 -p1
-%patch61 -p1 -b .rh133741.alwaysgtk.vcl.patch
-%patch62 -p1 -b .ooo85385.svtools.a11ycrash.patch
-%patch63 -p1 -b .ooo85429.sw.a11ycrash.patch
-%patch64 -p1 -b .ooo85448.emptyrpath.patch
-%patch65 -p1 -b .workspace.cairotext01.patch
-%patch66 -p1 -b .workspace.gcc430two.patch
-%patch67 -p1 -b .ooo85854.sw.graphicsaveas.patch
-%patch68 -p1 -b .ooo85921.sd.editmasterundermouse.patch
-%patch69 -p1 -b .ooo85931.svx.getentrypos.patch
-%patch70 -p1 -b .ooo86123.ucb.newneon.patch
-%patch71 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch72 -p1 -b .oooXXXXX.psprint.debugcups.patch
-%patch73 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
-%patch74 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch
-%patch75 -p1 -b .ooo86924.sfx2.iconchanges.patch
-%patch76 -p1 -b .ooo87204.toolkit.64bitevent.patch
-%patch77 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
-%patch78 -p1 -b .ooo85691.vcl.tooltipcolor.patch
-%patch79 -p1 -b .ooo87991.fpickersafe.patch
-%patch80 -p1 -b .ooo88033.svx.a11ycrash.patch
-%patch81 -p1 -b .ooo87071.sd.backgroundfix.patch
-%patch82 -p1 -b .ooo88090.chart2.negativecount.patch
-%patch83 -p1 -b .ooo89002.vcl.symbolfonts.patch
-%patch84 -p1 -b .workspace.os114.patch
-%patch85 -p1 -b .workspace.impress138.patch
-%patch86 -p1 -b .gcc36187.noaliasingbusted.patch
-%patch87 -p1 -b .ooo87970.vcl.samenamesubs.patch
+%patch51 -p1 -b .ooo83878.unopkg.enablelinking.patch
+%patch52 -p1 -b .workspace.notes2.patch
+%patch53 -p1 -b .ooo84676.ucb.davprotocol.patch
+%patch54 -p1 -b .ooo84621.sw.insertexcel.patch
+%patch55 -p1 -b .ooo84770.svx.eventsmismatch.patch
+%patch56 -p1 -b .ooo85054.stlport.noorigs.patch
+%patch57 -p1 -b .ooo86670.config_office.xpcomasxul.patch
+%patch58 -p1 -b .ooo85097.desktop.pagein.patch
+%patch59 -p1
+%patch60 -p1 -b .rh133741.alwaysgtk.vcl.patch
+%patch61 -p1 -b .ooo85385.svtools.a11ycrash.patch
+%patch62 -p1 -b .ooo85429.sw.a11ycrash.patch
+%patch63 -p1 -b .ooo85448.emptyrpath.patch
+%patch64 -p1 -b .workspace.cairotext01.patch
+%patch65 -p1 -b .workspace.gcc430two.patch
+%patch66 -p1 -b .ooo85854.sw.graphicsaveas.patch
+%patch67 -p1 -b .ooo85921.sd.editmasterundermouse.patch
+%patch68 -p1 -b .ooo85931.svx.getentrypos.patch
+%patch69 -p1 -b .ooo86123.ucb.newneon.patch
+%patch70 -p1 -b .ooo86080.unopkg.bodge.patch
+%patch71 -p1 -b .oooXXXXX.psprint.debugcups.patch
+%patch72 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
+%patch73 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch
+%patch74 -p1 -b .ooo86924.sfx2.iconchanges.patch
+%patch75 -p1 -b .ooo87204.toolkit.64bitevent.patch
+%patch76 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
+%patch77 -p1 -b .ooo85691.vcl.tooltipcolor.patch
+%patch78 -p1 -b .ooo87991.fpickersafe.patch
+%patch79 -p1 -b .ooo88033.svx.a11ycrash.patch
+%patch80 -p1 -b .ooo87071.sd.backgroundfix.patch
+%patch81 -p1 -b .ooo88090.chart2.negativecount.patch
+%patch82 -p1 -b .ooo89002.vcl.symbolfonts.patch
+%patch83 -p1 -b .workspace.impress138.patch
+%patch84 -p1 -b .gcc36187.noaliasingbusted.patch
+%patch85 -p1 -b .ooo87970.vcl.samenamesubs.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2916,8 +2912,10 @@
%changelog
-* Mon May 26 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.11-UNRELEASED
+* Sun Jun 01 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.1-17.1
- Resolves: rhbz#445588 add openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
+- drop integrated openoffice.org-2.3.1.ooo81307.sw.word2.patch
+- drop integrated workspace.os114.patch
* Thu May 22 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.10
- rebuild
pseudoworkspace.valgrind1.patch:
Index: pseudoworkspace.valgrind1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/pseudoworkspace.valgrind1.patch,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- pseudoworkspace.valgrind1.patch 11 Apr 2008 13:47:35 -0000 1.31
+++ pseudoworkspace.valgrind1.patch 1 Jun 2008 22:29:25 -0000 1.32
@@ -143,23 +143,6 @@
Color GetColor( USHORT nNum ) const;
-Index: source/inc/svdoimp.hxx
-===================================================================
-RCS file: /cvs/graphics/svx/source/inc/svdoimp.hxx,v
-retrieving revision 1.11
-diff -u -r1.11 svdoimp.hxx
---- openoffice.org.orig/svx/source/inc/svdoimp.hxx 26 Nov 2007 14:51:11 -0000 1.11
-+++ openoffice.org/svx/source/inc/svdoimp.hxx 24 Jan 2008 11:57:41 -0000
-@@ -258,7 +258,8 @@
- basegfx::B2DPolyPolygon& rPoLi)
- : mrLineAttr(rAttr),
- maAreaPolyPolygon(rPoPo),
-- maLinePolyPolygon(rPoLi)
-+ maLinePolyPolygon(rPoLi),
-+ mbLineDraft(false)
- {
- }
-
Index: source/ui/slidesorter/cache/SlsPageCacheManager.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx,v
workspace.notes2.patch:
Index: workspace.notes2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/workspace.notes2.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- workspace.notes2.patch 13 May 2008 06:45:28 -0000 1.12
+++ workspace.notes2.patch 1 Jun 2008 22:29:25 -0000 1.13
@@ -3254,25 +3254,6 @@
PROTOCOL( this, PROT_FILE_INIT, 0, 0)
-@@ -2870,14 +2882,12 @@
- // #i68597#
- const bool bGridPainting(pSh->GetWin() && pSh->Imp()->HasDrawView() && pSh->Imp()->GetDrawView()->IsGridVisible());
-
-+
- while ( pPage && !::IsShortCut( aRect, pPage->Frm() ) )
- {
-- // --> OD 2007-11-20 #i82616#
--// if ( !pPage->IsEmptyPage() && aRect.IsOver( pPage->Frm() ) )
-- SwRect aPaintRect;
-- pPage->GetBorderAndShadowBoundRect( pPage->Frm(), pSh, aPaintRect );
-- if ( !pPage->IsEmptyPage() && aRect.IsOver( aPaintRect ) )
-- // <--
-+ SwRect aPaintRect;
-+ pPage->GetBorderAndShadowBoundRect( pPage->Frm(), pSh, aPaintRect );
-+ if ( !pPage->IsEmptyPage() && aRect.IsOver( aPaintRect ) )
- {
- if ( pSh->GetWin() )
- {
@@ -2885,9 +2895,8 @@
// OD 18.11.2002 #99672# - create array for special sub-lines
pSpecSubsLines = new SwSubsRects;
workspace.unifysound01.patch:
Index: workspace.unifysound01.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/workspace.unifysound01.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- workspace.unifysound01.patch 28 Jan 2008 17:26:40 -0000 1.11
+++ workspace.unifysound01.patch 1 Jun 2008 22:29:25 -0000 1.12
@@ -2500,7 +2500,7 @@
diff -u -r1.27 makefile.mk
--- openoffice.org.orig/vcl/unx/source/app/makefile.mk 6 Feb 2007 14:19:12 -0000 1.27
+++ openoffice.org/vcl/unx/source/app/makefile.mk 8 Aug 2007 09:50:45 -0000
-@@ -69,13 +69,7 @@
+@@ -70,13 +70,7 @@
$(SLO)$/soicon.obj \
$(SLO)$/sm.obj \
$(SLO)$/keysymnames.obj \
@@ -2515,7 +2515,7 @@
EXCEPTIONSFILES=\
$(SLO)$/wmadaptor.obj \
-@@ -87,22 +81,6 @@
+@@ -88,22 +82,6 @@
$(SLO)$/salsys.obj
@@ -2535,9 +2535,9 @@
-.ENDIF
-.ENDIF
-
- .IF "$(USE_XINERAMA)" != "NO"
- CDEFS+=-DUSE_XINERAMA
- .IF "$(USE_XINERAMA_VERSION)" == "Xorg"
+ .IF "$(ENABLE_RANDR)" != ""
+ .IF "$(OS)" != "SOLARIS"
+ CDEFS+=-DUSE_RANDR
Index: unx/source/app/salinst.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/app/salinst.cxx,v
--- openoffice.org-2.3.1.ooo81307.sw.word2.patch DELETED ---
--- workspace.os114.patch DELETED ---
More information about the fedora-extras-commits
mailing list