rpms/openoffice.org/devel openoffice.org.spec, 1.1730, 1.1731 workspace.vcl97.patch, 1.3, 1.4 workspace.sjfixes12.patch, 1.1, NONE workspace.swffixes02.patch, 1.1, NONE
Caolan McNamara
caolanm at fedoraproject.org
Fri Dec 19 13:03:47 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2899
Modified Files:
openoffice.org.spec workspace.vcl97.patch
Removed Files:
workspace.sjfixes12.patch workspace.swffixes02.patch
Log Message:
fix up for m14
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1730 -r 1.1731 openoffice.org.spec
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1730
retrieving revision 1.1731
diff -u -r1.1730 -r1.1731
--- openoffice.org.spec 19 Dec 2008 11:53:14 -0000 1.1730
+++ openoffice.org.spec 19 Dec 2008 13:03:16 -0000 1.1731
@@ -1,9 +1,7 @@
-%define oootag OOO300
-%define ooomilestone 14
+%define oootag OOH680
+%define ooomilestone 18
%define rh_rpm_release 1
-# rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
-%define __jar_repack %{nil}
# undef to get english only and no-langpacks for a faster smoketest build
%define langpacks 1
# undef to revert to the traditional print dialog
@@ -17,6 +15,8 @@
%else
%define stlport_abi_lockin 0
%endif
+# undef to build with openjdk
+%define jdk_is_gcj 1
%if %{stlport_abi_lockin}
%define stlflags --with-stlport
@@ -24,8 +24,14 @@
%define stlflags --without-stlport
%endif
+%if %{jdk_is_gcj}
+%define java_devel java-1.5.0-devel
+%else
+%define java_devel java-1.6.0-devel
+%endif
+
%if %{langpacks}
-%define langpack_langs af ar bg bn ca cs cy da de dz el en-US es et eu fi fr ga gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn nr pl pt pt-BR ru sh sk sl sr ss st sv ta-IN th tr ve xh zh-CN zh-TW zu ns tn ts as-IN mr-IN ml-IN or-IN te-IN ur-IN kn uk
+%define langpack_langs af ar bg bn ca cs cy da de dz el en-US es et eu fi fr ga gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn nr pl pt pt-BR ru sh sk sl sr ss st sv ta-IN th tr ve xh zh-CN zh-TW zu ns tn ts as-IN mr-IN ml-IN or-IN te-IN ur-IN kn
%else
%define langpack_langs en-US
%endif
@@ -36,10 +42,10 @@
Summary: OpenOffice.org comprehensive office suite.
Name: openoffice.org
-Version: 3.0.1
+Version: 2.4.2
Release: %{ooomilestone}.%{rh_rpm_release}%{?dist}
Epoch: 1
-License: LGPLv3 and LGPLv2+ and MPLv1.1 and BSD
+License: LGPLv2 and LGPLv2+ and MPLv1.1 and BSD
Group: Applications/Productivity
URL: http://www.openoffice.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,103 +54,124 @@
Source2: http://people.redhat.com/caolanm/templates/Tigert-templates.tar.gz
Source3: documentation.openoffice.org-templates.tar.gz
Source4: http://people.redhat.com/caolanm/templates/redhat-templates.tar.gz
-Source5: http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
-Source6: redhat-registry.tar.gz
-Source7: redhat-langpacks.tar.gz
-Source8: redhat-agreement.xsl
-BuildRequires: zip, findutils, autoconf, flex, bison, icu, gcc-c++
-BuildRequires: binutils, java-devel, boost-devel, zlib-devel, vigra-devel
+Source5: http://www.openoffice.org/nonav/issues/showattachment.cgi/50963/bengali.sdf
+Source6: http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
+Source7: serbian_sr.sdf
+Source8: serbian_sh.sdf
+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, gperf
-BuildRequires: gecko-devel, libwpd-devel, hunspell-devel, unixODBC-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
-BuildRequires: freetype-devel, gtk2-devel, desktop-file-utils, hyphen-devel
+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, openssl-devel
-BuildRequires: lpsolve-devel, saxon, hsqldb, bsh, lucene, lucene-contrib
-BuildRequires: mesa-libGLU-devel, redland-devel, ant, ant-apache-regexp
-BuildRequires: jakarta-commons-codec, jakarta-commons-httpclient
-BuildRequires: jakarta-commons-lang, poppler-devel
-BuildRequires: pentaho-reporting-flow-engine, libXinerama-devel
+BuildRequires: gstreamer-devel, gstreamer-plugins-base-devel, hyphen-devel
+BuildRequires: openssl-devel, xalan-j2, xerces-j2, hsqldb, bsh
Patch0: openoffice.org-simple-crash_report.sh
Patch1: openoffice.org-multiliblauncher.sh
-Patch2: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
+Patch2: AutoSaveRecovery.xcu
+Patch3: RegisterAndLicence.xcu
+Patch4: AutoSaveCommon.xcu
+Patch5: libtextcat.xcu
+Patch6: openoffice.org.langpack-cjk.template
+Patch7: openoffice.org.langpack-help.template
+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
%if %{gtkprintui}
-Patch3: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
+Patch13: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
%endif
-Patch4: openoffice.org-2.0.0.ooo83140.jvmfwk.retryjvm.patch
-Patch5: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
-Patch6: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch7: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch8: openoffice.org-2.0.2.rh188467.printingdefaults.patch
-Patch9: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
-Patch10: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch11: workspace.i18n45.patch
-Patch12: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
-Patch13: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
-Patch14: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch15: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
-Patch16: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch17: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch18: openoffice.org-2.0.3.ooo97320.selinux.bridges.patch
-Patch19: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
-Patch20: workspace.impressfontsize.patch
-Patch21: workspace.impressfontsize.tar.gz
-Patch22: openoffice.org-2.3.0.ooo76649.httpencoding.patch
-Patch23: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch24: workspace.cmcfixes48.patch
-Patch25: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch26: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
-Patch27: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch28: workspace.mba31issues01.patch
-Patch29: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch30: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch31: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch32: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
-Patch33: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
-Patch34: workspace.locales31.patch
-Patch35: workspace.fpicker8.patch
-Patch36: workspace.cmcfixes49.patch
-Patch37: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
-Patch38: workspace.cmcfixes50.patch
-Patch39: openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch
-Patch40: workspace.sjfixes12.patch
-Patch41: workspace.vcl94.patch
-Patch42: workspace.vcl95.patch
-Patch43: openoffice.org-3.0.0.ooo94938.unopkg.handleexception.patch
-Patch44: workspace.mhu17.patch
-Patch45: openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch
-Patch46: openoffice.org-3.0.0.ooo95318.system-showicons.patch
-Patch47: workspace.vcl96.patch
-Patch48: workspace.hb12.patch
-Patch49: workspace.fwk92.patch
-Patch50: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch
-Patch51: workspace.sb101.patch
-Patch52: openoffice.org-3.0.0.ooo90072.sw.undo-longtext.patch
-Patch53: workspace.cmcfixes51.patch
-Patch54: openoffice.org-3.0.0.ooo96279.swext.mediawiki.proxies.patch
-Patch55: openoffice.org-3.0.0.ooo96391.sw.prefsalwaysmodified.patch
-Patch56: workspace.tkr16.patch
-Patch57: workspace.swffixes02.patch
-Patch58: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
-Patch59: workspace.transogl03.patch
-Patch60: workspace.vcl97.patch
-Patch61: openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch
-Patch62: workspace.vcl98.patch
-Patch63: openoffice.org-3.0.1.ooo97428.config_office.xinerama-on-x86_64.patch
-
-%define instdir %{_libdir}
-%define baseinstdir %{instdir}/openoffice.org
-%define ureinstdir %{baseinstdir}/ure
-%define basisinstdir %{baseinstdir}/basis3.0
-%define sdkinstdir %{baseinstdir}/basis3.0/sdk
-%define oooinstdir %{instdir}/openoffice.org3
-%define brinstdir %{instdir}/broffice.org3
-%define OFFICEUPD 300
-%define UPD %nil
-%define SOPOST l*
+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
[...5222 lines suppressed...]
-- add openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch
-
-* Mon Jun 09 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.18-1
-- next version
-- drop integrated openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
-- drop integrated openoffice.org-3.0.0.ooo88815.oox.parallel.patch
-
-* Fri Jun 06 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.17-2
+* Fri Jun 06 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.1-17.3
+- remove pointless "register" dialog request
- Resolves: rhbz#450212 openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch
-* Thu Jun 05 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.17-1
-- next version
-- drop integrated openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
-
-* Thu Jun 05 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.16-2
-- still fighting the sdk
-
-* Wed Jun 04 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.16-1
-- next version
-- add openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch
-- add openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch
-- Resolves: rhbz#449804 fix Requires
-
-* Tue Jun 03 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.15-1
-- next version
-- add openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch for building against
- 3 layer OOo
-- drop integrated openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch
-- drop integrated openoffice.org-3.0.0.ooo89172.filter.string.patch
-- filter out -fasynchronous-unwind-tables for the moment until its ok with
- -Os on i386
-- Resolves: rhbz#448553 add openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch
+* Tue Jun 03 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.1-17.2
+- filter out -fasynchronous-unwind-tables because it doesn't work with -Os
+ on i386
+- Resolves: rhbz#448553 openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch
-* Wed May 28 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.14-1
-- next version
-- Require new hunspell-ml for Malayalam langpack
-- drop integrated openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
-- drop integrated openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
-- add openoffice.org-3.0.0.ooo89921.oox.parallel.patch
+* 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
-- add openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch
-
-* 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
-
-* Fri May 09 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.12.1
-- next version
-- re-add openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+- drop integrated openoffice.org-2.3.1.ooo81307.sw.word2.patch
+- drop integrated workspace.os114.patch
-* Fri May 09 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.11.1
-- next version
-- drop integrated workspace.cmcfixes43.patch
-- drop integrated openoffice.org-3.0.0.ooo88375.filter.disablepdf.patch
-- drop integrated openoffice.org-3.0.0.ooo88319.setup_native.missing.patch
-- drop redundant openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
-- drop openoffice.org-2.0.4.rh217065.syncbackspace.patch as reported fixed
-- add openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
-- add openoffice.org-3.0.0.ooo89172.filter.string.patch
-- enable presentation-minimizer
-- enable presenter-screen
-- tidy configure line through --with-system-libs --with-system-headers
-- drop sequence check patch and use .xcu configuration
+* Thu May 22 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.10
+- rebuild
+- Resolves: rhbz#447199 add workspace.impress138.patch
+- Resolves: rhbz#447212 nostrict-aliasing is broken gcc#36187
-* Wed Apr 30 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.10.1
-- next version
-- drop integrated openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
-- drop integrated openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
-- drop openoffice.org-2.4.0.gccXXXXX.wizards.patch
-- drop openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
-- drop openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
-- drop openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
-- drop openoffice.org-2.2.0.rh232389.tango.patch
+* Mon May 12 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.9
- Resolves: rhbz#444571 add openoffice.org-3.0.0.ooo88090.chart2.negativecount.patch
-- add workspace.ucpgio1.patch and disable gnome-vfs
-
-* Mon Apr 21 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.9.1
-- Resolves: rhbz#358021 enable BrOffice.org brand
-- add openoffice.org-3.0.0.ooo88375.filter.disablepdf.patch
-- add openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
-- add openoffice.org-2.4.0.gccXXXXX.wizards.patch to try and build
+- Resolves: rhbz#445318 fix notes related crash
+- Resolves: rhbz#445953 backport 2.4.1 ww8 bidi digit fixes
+- Resolves: rhbz#446005 there's something very wrong here, but every
+ attempt to isolate it makes it go away
+- add openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
-* Wed Apr 16 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.7.1
-- next version
-- drop integrated openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
-- extend selinux bodge to s390x
-- add openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch
-- add openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
-- disable pdfimport for now
-- add openoffice.org-3.0.0.ooo88319.setup_native.missing.patch
-- add openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
+* Sat Apr 26 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.8
+- add openoffice.org-2.4.0.ooo87071.sd.backgroundfix.patch
-* Wed Apr 09 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.5.4
-- Resolves: rhbz#441128 openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch
-- migrate system extensions automatically
-- Resolves: rhbz#358021 split up into brand layers and add BrOffice.org
-- try and share unopkg and make a broffice.org launcher to allow both to
- be installed at the same time
+* Wed Apr 23 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.7
+- Resolves: rhbz#443356 fontconfig gives different results for "canonical"
+ font name vs localized font name
+- Resolves: rhbz#443735 weird ass rendering for Sazanami fonts
-* Mon Apr 07 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.5.3
+* Fri Apr 18 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.6
+- Resolves: rhbz#439727 find another crasher
- Resolves: rhbz#441112 openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
- Resolves: rhbz#441108 openoffice.org-3.0.0.ooo87991.fpickersafe.patch
+- Resolves: rhbz#441128 openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch
+- add openoffice.org-2.4.0.gccXXXXX.wizards.patch to try and build
-* Fri Apr 04 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.5.2
-- reenable dicts
+* Wed Apr 02 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.5
+- Resolves: rhbz#439727 find crasher
+- Resolves: rhbz#436518 try and workaround bizarro bug
-* Mon Mar 31 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.5.1
-- drop integrated workspace.cairotext01.patch
-- fix up launchers
-- fix up configuration settings without using configimport
-- extend selinux bodge to arm, mips and s390
-- add openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
-
-* Tue Mar 27 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
-- drop integrated openoffice.org-2.4.0.ooo85385.svtools.a11ycrash.patch
-- 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
-- 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
-- libsoffice partially integrated into head
-- add workspace.cmcfixes43.patch
-- add the report-builder
+* Tue Apr 01 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.4
+- Resolves: rhbz#439727 add workspace.notes3.patch4
-* Wed Mar 19 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.2
+* Fri Mar 28 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.3
- add openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
- add openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
@@ -4218,12 +3044,6 @@
- drop integrated openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch
- Resolves: rhbz#436518 add openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
-* Sun Mar 09 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-10.1
-- next release candidate
-- rhbz#293791 Restore draw back to the menus and revert to upstream app names
-- drop integrated openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch
-- Resolves: rhbz#436518 add openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
-
* Thu Mar 06 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-9.1
- next release candidate
@@ -4322,7 +3142,7 @@
- fix broken requires
* Fri Jan 11 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-1.2
-- add openoffice.org-2.4.0.ooo92086.solenv.paths.patch to fix up -devel Requires
+- add openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch to fix up -devel Requires
- add openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
- Resolves: rhbz#425701/ooo#83410 try and fix serbian translations
workspace.vcl97.patch:
Index: workspace.vcl97.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.vcl97.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- workspace.vcl97.patch 11 Dec 2008 13:28:02 -0000 1.3
+++ workspace.vcl97.patch 19 Dec 2008 13:03:17 -0000 1.4
@@ -26,7 +26,7 @@
===================================================================
--- openoffice.org.orig/vcl/unx/source/gdi/salgdi3.cxx (revision 265133)
+++ openoffice.org/vcl/unx/source/gdi/salgdi3.cxx (working copy)
-@@ -1545,7 +1545,7 @@
+@@ -1567,7 +1567,7 @@
// ----------------------------------------------------------------------------
@@ -35,12 +35,12 @@
void X11SalGraphics::GetDevFontList( ImplDevFontList *pList )
{
-@@ -1806,7 +1806,7 @@
+@@ -2009,7 +2009,7 @@
bool FindFontSubstitute( ImplFontSelectData&, OUString& rMissingCodes ) const;
};
-static void RegisterFontSubstitutors( ImplDevFontList* pList )
+void RegisterFontSubstitutors( ImplDevFontList* pList )
{
- bool bDisableFC = false;
- #ifdef SOLARIS
+ // init font substitution defaults
+ int nDisableBits = 0;
--- workspace.sjfixes12.patch DELETED ---
--- workspace.swffixes02.patch DELETED ---
More information about the fedora-extras-commits
mailing list