rpms/openoffice.org/devel ooo-build.ooo68717.gstreamer.video.patch, 1.4, 1.5 openoffice.org.spec, 1.2117, 1.2118 sources, 1.387, 1.388 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize, 1.1, NONE openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.56, NONE openoffice.org-multiliblauncher.sh, 1.5, NONE
Caolan McNamara
caolanm at fedoraproject.org
Sun Jan 10 14:23:15 UTC 2010
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19485
Modified Files:
ooo-build.ooo68717.gstreamer.video.patch openoffice.org.spec
sources
Removed Files:
openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
openoffice.org-multiliblauncher.sh
Log Message:
latest milestone
ooo-build.ooo68717.gstreamer.video.patch:
avmedia/prj/build.lst | 3
avmedia/source/gstreamer/ChangeLog | 112 +++
avmedia/source/gstreamer/exports.dxp | 4
avmedia/source/gstreamer/gstcommon.hxx | 83 ++
avmedia/source/gstreamer/gstframegrabber.cxx | 244 ++++++++
avmedia/source/gstreamer/gstframegrabber.hxx | 78 ++
avmedia/source/gstreamer/gstmanager.cxx | 114 +++
avmedia/source/gstreamer/gstmanager.hxx | 74 ++
avmedia/source/gstreamer/gstplayer.cxx | 628 ++++++++++++++++++++++
avmedia/source/gstreamer/gstplayer.hxx | 120 ++++
avmedia/source/gstreamer/gstuno.cxx | 111 +++
avmedia/source/gstreamer/gstwindow.cxx | 365 ++++++++++++
avmedia/source/gstreamer/gstwindow.hxx | 119 ++++
avmedia/source/gstreamer/makefile.mk | 85 ++
avmedia/source/inc/mediamisc.hxx | 4
avmedia/source/viewer/mediawindow.cxx | 3
avmedia/source/viewer/mediawindow_impl.cxx | 52 +
avmedia/source/viewer/mediawindow_impl.hxx | 8
com/sun/star/wizards/letter/LocaleCodes.java | 2
configure.in | 21
scp2/source/ooo/file_library_ooo.scp | 4
scp2/source/ooo/module_hidden_ooo.scp | 1
set_soenv.in | 1
slideshow/source/engine/shapes/viewmediashape.cxx | 38 +
slideshow/source/engine/shapes/viewmediashape.hxx | 7
solenv/inc/settings.mk | 4
source/gstreamer/gstplayer.cxx | 15
source/gstreamer/gstplayer.hxx | 1
svtools/inc/svtools/inettype.hxx | 4
svtools/inc/svtools/svtools.hrc | 210 +++----
svtools/source/misc1/inettype.cxx | 5
svtools/source/misc1/mediatyp.src | 162 +++++
vcl/inc/vcl/salobj.hxx | 2
vcl/inc/vcl/syschild.hxx | 1
vcl/source/window/syschild.cxx | 6
vcl/unx/gtk/window/gtkobject.cxx | 8
vcl/unx/inc/plugins/gtk/gtkobject.hxx | 2
37 files changed, 2586 insertions(+), 115 deletions(-)
Index: ooo-build.ooo68717.gstreamer.video.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/ooo-build.ooo68717.gstreamer.video.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ooo-build.ooo68717.gstreamer.video.patch 2 Nov 2009 08:07:30 -0000 1.4
+++ ooo-build.ooo68717.gstreamer.video.patch 10 Jan 2010 14:21:16 -0000 1.5
@@ -917,7 +917,7 @@ diff -u -p -r1.5 salobj.hxx
virtual void SetBackground() = 0;
virtual void SetBackground( SalColor nSalColor ) = 0;
-+ virtual void SetForwardKey( BOOL bEnable ) {}
++ virtual void SetForwardKey( BOOL /*bEnable*/ ) {}
+
virtual const SystemEnvData* GetSystemData() const = 0;
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2117
retrieving revision 1.2118
diff -u -p -r1.2117 -r1.2118
--- openoffice.org.spec 4 Jan 2010 10:42:23 -0000 1.2117
+++ openoffice.org.spec 10 Jan 2010 14:21:17 -0000 1.2118
@@ -1,6 +1,6 @@
%define oootag OOO320
-%define ooomilestone 8
-%define rh_rpm_release 6
+%define ooomilestone 9
+%define rh_rpm_release 1
# rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
%define __jar_repack %{nil}
@@ -35,103 +35,97 @@
%define ooo_base_name %{oootag}_m%{ooomilestone}
-Summary: OpenOffice.org comprehensive office suite.
+Summary: OpenOffice.org comprehensive office suite
Name: openoffice.org
Version: 3.2.0
-Release: %{ooomilestone}.%{rh_rpm_release}%{?dist}
-Epoch: 1
-License: LGPLv3 and LGPLv2+ and MPLv1.1 and BSD
-Group: Applications/Productivity
-URL: http://www.openoffice.org/
+Release: %{ooomilestone}.%{rh_rpm_release}%{?dist}
+Epoch: 1
+License: LGPLv3 and LGPLv2+ and MPLv1.1 and BSD
+Group: Applications/Productivity
+URL: http://www.openoffice.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: %{ooo_base_name}.tar.bz2
-Source1: http://cgit.freedesktop.org/ooo-build/ooo-build/plain/src/evolocal.odb
-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
+Source0: %{ooo_base_name}.tar.bz2
+Source1: http://cgit.freedesktop.org/ooo-build/ooo-build/plain/src/evolocal.odb
+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
Source9: openoffice.org-javafilter.desktop
Source10: http://www.openoffice.org/nonav/issues/showattachment.cgi/65132/acor_ga-IE.dat
-BuildRequires: zip, findutils, autoconf, flex, bison, icu, gperf, gcc-c++
-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: libXext-devel, libXt-devel, libICE-devel, libjpeg-devel,
-BuildRequires: gecko-devel, libwpd-devel, hunspell-devel, unixODBC-devel
-BuildRequires: db4-devel, sane-backends-devel, libicu-devel, perl-Archive-Zip
-BuildRequires: freetype-devel, gtk2-devel, desktop-file-utils, hyphen-devel
-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
+Source11: openoffice.org-multiliblauncher.sh
+BuildRequires: zip, findutils, autoconf, flex, bison, icu, gperf, gcc-c++
+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: libXext-devel, libXt-devel, libICE-devel, libjpeg-devel,
+BuildRequires: gecko-devel, libwpd-devel, hunspell-devel, unixODBC-devel
+BuildRequires: db4-devel, sane-backends-devel, libicu-devel, perl-Archive-Zip
+BuildRequires: freetype-devel, gtk2-devel, desktop-file-utils, hyphen-devel
+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, fontpackages-devel
BuildRequires: pentaho-reporting-flow-engine, libXinerama-devel
-Patch1: openoffice.org-multiliblauncher.sh
-%if %{gtkprintui}
-Patch2: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
-%endif
-Patch3: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
-Patch4: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch5: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch6: openoffice.org-2.0.2.rh188467.printingdefaults.patch
-Patch7: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
-Patch8: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch9: workspace.printerpullpages.patch
-%if %{gtkprintui}
-Patch10: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
-%endif
-Patch11: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch12: ooo-build.ooo68717.gstreamer.video.patch
-Patch13: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
-Patch14: openoffice.org-2.3.0.ooo76649.httpencoding.patch
-Patch15: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch16: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch17: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch18: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch19: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
-Patch20: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
-Patch21: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
-Patch22: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
-Patch23: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch24: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
-Patch25: ooo-build.ooo2497.filter.svg.patch
-Patch26: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
-Patch27: workspace.slideshow1.patch
-Patch28: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
-Patch29: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
-Patch30: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
-Patch31: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch
-Patch32: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
-Patch33: openoffice.org-3.1.0.ooo102142.sd.resleak.patch
-Patch34: openoffice.org-2.0.0.ooo46270.svx.search-dialog.no-find-all-in-draw.patch
-Patch35: openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
-Patch36: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
-Patch37: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
-Patch38: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
-Patch39: workspace.vcl106.patch
-Patch40: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
-Patch41: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
-Patch42: openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch
-Patch43: workspace.gsminhibit.patch
-Patch44: workspace.vcl107.patch
-Patch45: workspace.hb33patches1.patch
-Patch46: workspace.ause109.patch
-Patch47: workspace.cmcfixes67.patch
-Patch48: workspace.srb1.patch
-Patch49: workspace.impress184.patch
-Patch50: openoffice.org-3.2.0.ooo107137.canvas.fixcolorspace.patch
-Patch51: openoffice.org-3.3.0.ooo102645.fix.es.patch
-Patch52: workspace.vcl108.patch
-Patch53: workspace.pythonssldedux.patch
-Patch54: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
-Patch55: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
-Patch56: openoffice.org-3.2.0.ooo107834.sw.pseudoattribs.patch
-Patch57: openoffice.org-3.3.0.ooo108047.writerfilter.safer-field-context-handling.patch
+Patch1: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
+Patch2: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch3: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch4: openoffice.org-2.0.2.rh188467.printingdefaults.patch
+Patch5: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
+Patch6: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch7: workspace.printerpullpages.patch
+Patch8: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch9: ooo-build.ooo68717.gstreamer.video.patch
+Patch10: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
+Patch11: openoffice.org-2.3.0.ooo76649.httpencoding.patch
+Patch12: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
+Patch13: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+Patch14: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch15: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
+Patch16: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
+Patch17: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
+Patch18: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
+Patch19: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
+Patch20: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch21: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
+Patch22: ooo-build.ooo2497.filter.svg.patch
+Patch23: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
+Patch24: workspace.slideshow1.patch
+Patch25: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
+Patch26: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
+Patch27: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
+Patch28: openoffice.org-3.1.0.ooo101567.i18npool.mailocaledata.patch
+Patch29: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
+Patch30: openoffice.org-3.1.0.ooo102142.sd.resleak.patch
+Patch31: openoffice.org-2.0.0.ooo46270.svx.search-dialog.no-find-all-in-draw.patch
+Patch32: openoffice.org-3.1.0.ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
+Patch33: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
+Patch34: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
+Patch35: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
+Patch36: workspace.vcl106.patch
+Patch37: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
+Patch38: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
+Patch39: openoffice.org-3.2.0.ooo106032.linguistic.defaulttoplain.patch
+Patch40: workspace.gsminhibit.patch
+Patch41: workspace.vcl107.patch
+Patch42: workspace.hb33patches1.patch
+Patch43: workspace.ause109.patch
+Patch44: workspace.cmcfixes67.patch
+Patch45: workspace.srb1.patch
+Patch46: workspace.impress184.patch
+Patch47: openoffice.org-3.2.0.ooo107137.canvas.fixcolorspace.patch
+Patch48: openoffice.org-3.3.0.ooo102645.fix.es.patch
+Patch49: workspace.vcl108.patch
+Patch50: workspace.pythonssldedux.patch
+Patch51: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
+Patch52: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
+Patch53: openoffice.org-3.2.0.ooo107834.sw.pseudoattribs.patch
+Patch54: openoffice.org-3.3.0.ooo108047.writerfilter.safer-field-context-handling.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@@ -165,7 +159,7 @@ Summary: Core modules for OpenOffice.org
Group: Applications/Productivity
Requires: %{name}-%{fontname}-fonts = %{epoch}:%{version}-%{release}
Requires: %{name}-ure = %{epoch}:%{version}-%{release}
-Requires: liberation-sans-fonts, liberation-serif-fonts, liberation-mono-fonts
+Requires: liberation-sans-fonts >= 1.0, liberation-serif-fonts >= 1.0, liberation-mono-fonts >= 1.0
Requires: dejavu-sans-fonts, dejavu-serif-fonts, dejavu-sans-mono-fonts
Requires: hunspell-en, hyphen-en, hyphen >= 2.4, autocorr-en
Requires: saxon, lucene
@@ -534,8 +528,8 @@ Requires: %{name}-core = %{epoch}:%{vers
Obsoletes: openoffice.org2-graphicfilter < 1:3.0.0
%description graphicfilter
-The graphicfilter module for OpenOffice.org provides graphic filters, e.g. svg and
-flash filters.
+The graphicfilter module for OpenOffice.org provides graphic filters,
+e.g. svg and flash filters.
%package xsltfilter
Summary: Optional xsltfilter module for OpenOffice.org
@@ -554,8 +548,8 @@ Requires: %{name}-core = %{epoch}:%{vers
Obsoletes: openoffice.org2-javafilter < 1:3.0.0
%description javafilter
-The javafilter module for OpenOffice.org, provides additional AportisDoc, Pocket Excel
-and Pocket Word import filters.
+The javafilter module for OpenOffice.org, provides additional AportisDoc,
+Pocket Excel and Pocket Word import filters.
%post javafilter
update-desktop-database %{_datadir}/applications &> /dev/null || :
@@ -624,8 +618,8 @@ Requires: %{name}-core = %{epoch}:%{vers
Requires: %{name}-sdk = %{epoch}:%{version}-%{release}
%description devel
-The OpenOffice.org devel package provides necessary headers for development against
-OpenOffice.org.
+The OpenOffice.org devel package provides necessary headers for
+development against OpenOffice.org.
%package headless
Summary: OpenOffice.org Headless plugin
@@ -1623,66 +1617,60 @@ Rules for autocorrecting common Chinese
mv -f redhat.soc extras/source/palettes/standard.soc
cp -p %{SOURCE1} extras/source/database/evolocal.odb
cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
-%if %{gtkprintui}
-%patch2 -p1 -b .rh127576.gtkunixprintdialog.patch
-%endif
-%patch3 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
-%patch4 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch5 -p1 -b .ooo58606.sw.pre-edit.patch
-%patch6 -p1
-%patch7 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
-%patch8 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch9 -p0 -b .workspace.printerpullpages.patch
-%if %{gtkprintui}
-cat %{PATCH10} >> svtools/source/dialogs/localize.sdf
-%endif
-%patch11 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch12 -p0 -b .ooo68717.gstreamer.video.patch
-%patch13 -p1 -b .ooo7065.sw.titlepagedialog.patch
-%patch14 -p1 -b .ooo76649.httpencoding.patch
-%patch15 -p1 -b .ooo83878.unopkg.enablelinking.patch
-%patch16 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch17 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch18 -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch19 -p1 -b .ooo87970.vcl.samenamesubs.patch
-%patch20 -p1 -b .ooo91924.svx.consistentordering.patch
-%patch21 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
-%patch22 -p0 -b .ooo98137.filter.redeclared-variables.patch
-%patch23 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch24 -p1 -b .oooXXXXX.solenv.allowmissing.patch
-%patch25 -p1 -b .ooo2497.filter.svg.patch
-%patch26 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
-%patch27 -p2 -b .workspace.slideshow1.patch
-%patch28 -p0 -b .ooo101274.opening-a-directory.patch
-%patch29 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
-%patch30 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
-%patch31 -p0 -b .ooo101567.i18npool.mailocaledata.patch
-%patch32 -p0 -b .ooo102061.sc.cellanchoring.patch
-%patch33 -p0 -b .ooo102142.sd.resleak.patch
-%patch34 -p0 -b .ooo46270.svx.search-dialog.no-find-all-in-draw.patch
-%patch35 -p0 -b .ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
-%patch36 -p0 -b .ooo104329.dbaccess.primarykeys.patch
-%patch37 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
-%patch38 -p1 -b .oooXXXXXX.sal.justcoredump.patch
-%patch39 -p0 -b .workspace.vcl106.patch
-%patch40 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
-%patch41 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
-%patch42 -p0 -b .ooo106032.linguistic.defaulttoplain.patch
-%patch43 -p1 -b .workspace.gsminhibit.patch
-%patch44 -p1 -b .workspace.vcl107.patch
-%patch45 -p0 -b .workspace.hb33patches1.patch
-%patch46 -p0 -b .workspace.ause109.patch
-%patch47 -p1 -b .workspace.cmcfixes67.patch
-%patch48 -p1 -b .workspace.srb1.patch
-%patch49 -p0 -b .workspace.impress184.patch
-%patch50 -p0 -b .ooo107137.canvas.fixcolorspace.patch
-%patch51 -p0 -b .ooo102645.fix.es.patch
-%patch52 -p0 -b .workspace.vcl108.patch
-%patch53 -p1 -b .workspace.pythonssldedux.patch
-%patch54 -p1 -b .ooo106502.svx.fixspelltimer.patch
-%patch55 -p0 -b .ooo47279.sd.objectsave.safe.patch
-%patch56 -p0 -b .ooo107834.sw.pseudoattribs.patch
-%patch57 -p1 -b .ooo108047.writerfilter.safer-field-context-handling.patch
+%patch1 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
+%patch2 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch3 -p1 -b .ooo58606.sw.pre-edit.patch
+%patch4 -p1
+%patch5 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
+%patch6 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch7 -p0 -b .workspace.printerpullpages.patch
+%patch8 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
+%patch9 -p0 -b .ooo68717.gstreamer.video.patch
+%patch10 -p1 -b .ooo7065.sw.titlepagedialog.patch
+%patch11 -p1 -b .ooo76649.httpencoding.patch
+%patch12 -p1 -b .ooo83878.unopkg.enablelinking.patch
+%patch13 -p1 -b .ooo86080.unopkg.bodge.patch
+%patch14 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch15 -p1 -b .ooo88341.sc.verticalboxes.patch
+%patch16 -p1 -b .ooo87970.vcl.samenamesubs.patch
+%patch17 -p1 -b .ooo91924.svx.consistentordering.patch
+%patch18 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
+%patch19 -p0 -b .ooo98137.filter.redeclared-variables.patch
+%patch20 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch21 -p1 -b .oooXXXXX.solenv.allowmissing.patch
+%patch22 -p1 -b .ooo2497.filter.svg.patch
+%patch23 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
+%patch24 -p2 -b .workspace.slideshow1.patch
+%patch25 -p0 -b .ooo101274.opening-a-directory.patch
+%patch26 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
+%patch27 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
+%patch28 -p0 -b .ooo101567.i18npool.mailocaledata.patch
+%patch29 -p0 -b .ooo102061.sc.cellanchoring.patch
+%patch30 -p0 -b .ooo102142.sd.resleak.patch
+%patch31 -p0 -b .ooo46270.svx.search-dialog.no-find-all-in-draw.patch
+%patch32 -p0 -b .ooo104280.xmloff.lcl_IsAtEnd.wrong.patch
+%patch33 -p0 -b .ooo104329.dbaccess.primarykeys.patch
+%patch34 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
+%patch35 -p1 -b .oooXXXXXX.sal.justcoredump.patch
+%patch36 -p0 -b .workspace.vcl106.patch
+%patch37 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
+%patch38 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
+%patch39 -p0 -b .ooo106032.linguistic.defaulttoplain.patch
+%patch40 -p1 -b .workspace.gsminhibit.patch
+%patch41 -p1 -b .workspace.vcl107.patch
+%patch42 -p0 -b .workspace.hb33patches1.patch
+%patch43 -p0 -b .workspace.ause109.patch
+%patch44 -p1 -b .workspace.cmcfixes67.patch
+%patch45 -p1 -b .workspace.srb1.patch
+%patch46 -p0 -b .workspace.impress184.patch
+%patch47 -p0 -b .ooo107137.canvas.fixcolorspace.patch
+%patch48 -p0 -b .ooo102645.fix.es.patch
+%patch49 -p0 -b .workspace.vcl108.patch
+%patch50 -p1 -b .workspace.pythonssldedux.patch
+%patch51 -p1 -b .ooo106502.svx.fixspelltimer.patch
+%patch52 -p0 -b .ooo47279.sd.objectsave.safe.patch
+%patch53 -p0 -b .ooo107834.sw.pseudoattribs.patch
+%patch54 -p1 -b .ooo108047.writerfilter.safer-field-context-handling.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1980,6 +1968,9 @@ cp -f solver/%{OFFICEUPD}/unxlng*.pro/li
chmod -x $RPM_BUILD_ROOT/%{basisinstdir}/program/testtoolrc
chmod -x $RPM_BUILD_ROOT/%{basisinstdir}/program/hid.lst
+#remove spurious exec bits
+chmod -x $RPM_BUILD_ROOT/%{basisinstdir}/program/gengalrc
+
#We don't need to carry around all the letter templates for all the languages
#in each langpack! In addition, all the bitmaps are the same!
pushd $RPM_BUILD_ROOT/%{basisinstdir}/share/template
@@ -2226,18 +2217,18 @@ echo \#\!/bin/sh > $RPM_BUILD_ROOT/%{_bi
echo exec openoffice.org -base \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/oobase
chmod a+x $RPM_BUILD_ROOT/%{_bindir}/oobase
-cp -f %{PATCH1} $RPM_BUILD_ROOT/%{_bindir}/unopkg
+cp -f %{SOURCE11} $RPM_BUILD_ROOT/%{_bindir}/unopkg
sed -i -e "s/LAUNCHER/unopkg/g" $RPM_BUILD_ROOT/%{_bindir}/unopkg
sed -i -e "s/BRAND/openoffice.org3/g" $RPM_BUILD_ROOT/%{_bindir}/unopkg
chmod a+x $RPM_BUILD_ROOT/%{_bindir}/unopkg
-cp -f %{PATCH1} $RPM_BUILD_ROOT/%{_bindir}/openoffice.org
+cp -f %{SOURCE11} $RPM_BUILD_ROOT/%{_bindir}/openoffice.org
sed -i -e "s/LAUNCHER/soffice/g" $RPM_BUILD_ROOT/%{_bindir}/openoffice.org
sed -i -e "s/BRAND/openoffice.org3/g" $RPM_BUILD_ROOT/%{_bindir}/openoffice.org
chmod a+x $RPM_BUILD_ROOT/%{_bindir}/openoffice.org
%if %{langpacks}
-cp -f %{PATCH1} $RPM_BUILD_ROOT/%{_bindir}/broffice.org
+cp -f %{SOURCE11} $RPM_BUILD_ROOT/%{_bindir}/broffice.org
sed -i -e "s/LAUNCHER/soffice/g" $RPM_BUILD_ROOT/%{_bindir}/broffice.org
sed -i -e "s/BRAND/broffice.org3/g" $RPM_BUILD_ROOT/%{_bindir}/broffice.org
chmod a+x $RPM_BUILD_ROOT/%{_bindir}/broffice.org
@@ -4156,6 +4147,9 @@ fi
%endif
%changelog
+* Sun Jan 10 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-9.1
+- latest milestone
+
* Mon Jan 04 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-8.6
- Resolves: rhbz#551983 OpenOffice writer crashes when opening document
with link in footnote (dtardon)
@@ -6223,7 +6217,7 @@ fi
* Fri Jan 27 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-9
- add openoffice.org-2.0.2.ooo61178.ucb.neon25.patch for neon 0.25.X
-- missing %defattr(-,root,root)
+- missing defattr(-,root,root)
- rh#179256# if java fails (i.e. was configured to use libgcj.so.6) reconfigure
to pick up libgcj.so.7
- rh#177205# add some templates, including a fedora themed presentation
@@ -6956,8 +6950,8 @@ experimentation
- bump to 1.9.81
- drop integrated openoffice.org-1.9.77.ooo42152.gnomevfs.patch
- with --with-system-stdlibs
- rm -f $RPM_BUILD_ROOT/%{instdir}/program/libgcc_s.so.*
- rm -f $RPM_BUILD_ROOT/%{instdir}/program/libstdc++.so.*
+ rm -f $RPM_BUILD_ROOT/instdir/program/libgcc_s.so.*
+ rm -f $RPM_BUILD_ROOT/instdir/program/libstdc++.so.*
becomes redundant
- --with-system-icu & --with-system-db3 no longer in --with-system-libs
- sc needs another file in exceptions because of system-boost
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -p -r1.387 -r1.388
--- sources 10 Jan 2010 14:18:59 -0000 1.387
+++ sources 10 Jan 2010 14:21:17 -0000 1.388
@@ -1,10 +1,11 @@
+74939c9ea525374776f09bf972ede99f openoffice.org-multiliblauncher.sh
e3a0b76dcd876f3d721ee7183729153d unowinreg.dll
16cb79cb018c6311e9797e85bd2461b2 evolocal.odb
b54bcc9fdb23389e961b281508d9110c documentation.openoffice.org-templates.tar.gz
1b4d9a03ebb4c864015620153afb77c6 Tigert-templates.tar.gz
f0cda31fe18bf9289629a321663031b8 redhat-templates.tar.gz
-ffa417a9556cdb16028c83718d758bc7 redhat-langpacks.tar.gz
-0c195c73f76d3e52da7588904bae8af0 openoffice.org-javafilter.desktop
+6089a44823e21fc4bdb92033d616e033 redhat-langpacks.tar.gz
39a2c59cfae4019eda4a63f414c0aa54 redhat-registry.tar.gz
+6c28507e29056a3afb4baffdadab8499 openoffice.org-javafilter.desktop
ef64057ee7e48ca472e80dd87f3dd426 acor_ga-IE.dat
24acc9e015d6fffbf0f1ff31593a29ca OOO320_m9.tar.bz2
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize DELETED ---
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch DELETED ---
--- openoffice.org-multiliblauncher.sh DELETED ---
More information about the scm-commits
mailing list