rpms/openoffice.org/devel .cvsignore, 1.171, 1.172 openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch, 1.1, 1.2 openoffice.org.spec, 1.1538, 1.1539 sources, 1.296, 1.297 openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch, 1.3, NONE openoffice.org-3.0.0.ooo87882.lingucomponent.systemdicts.patch, 1.1, NONE openoffice.org-3.0.0.ooo90071.chart2.negativecount.patch, 1.1, NONE
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Thu Jun 19 08:22:12 UTC 2008
- Previous message (by thread): rpms/openais/devel revision-1552.patch, NONE, 1.1 openais.spec, 1.25, 1.26
- Next message (by thread): rpms/gtkwave/devel .cvsignore, 1.50, 1.51 gtkwave.spec, 1.54, 1.55 sources, 1.50, 1.51
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5731
Modified Files:
.cvsignore
openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch
openoffice.org.spec sources
Removed Files:
openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
openoffice.org-3.0.0.ooo87882.lingucomponent.systemdicts.patch
openoffice.org-3.0.0.ooo90071.chart2.negativecount.patch
Log Message:
next version
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- .cvsignore 11 Jun 2008 13:33:20 -0000 1.171
+++ .cvsignore 19 Jun 2008 08:21:28 -0000 1.172
@@ -4,4 +4,5 @@
Tigert-templates.tar.gz
unowinreg.dll
bengali.sdf
-DEV300_m19.tar.bz2
+DEV300_m20.tar.bz2
+redhat-registry.tar.gz
openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch:
Index: openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch 3 Jun 2008 15:53:59 -0000 1.1
+++ openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch 19 Jun 2008 08:21:28 -0000 1.2
@@ -10,7 +10,7 @@
cairo_surface_t *surface = rCairo.xlib_surface_create_with_xrender_format (pDisplay,
- hDrawable_, DefaultScreenOfDisplay(pDisplay), pVisualFormat, 1, 1);
-+ hDrawable_, DefaultScreenOfDisplay(pDisplay), pVisualFormat, SAL_MAX_INT16, SAL_MAX_INT16);
++ hDrawable_, ScreenOfDisplay(pDisplay, m_nScreen), pVisualFormat, SAL_MAX_INT16, SAL_MAX_INT16);
/*
* It might be ideal to cache surface and cairo context between calls and
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1538
retrieving revision 1.1539
diff -u -r1.1538 -r1.1539
--- openoffice.org.spec 16 Jun 2008 08:01:06 -0000 1.1538
+++ openoffice.org.spec 19 Jun 2008 08:21:28 -0000 1.1539
@@ -1,6 +1,6 @@
%define oootag DEV300
-%define ooomilestone 19
-%define rh_rpm_release 2
+%define ooomilestone 20
+%define rh_rpm_release 1
# undef to get english only and no-langpacks for a faster smoketest build
%define langpacks 1
@@ -15,8 +15,6 @@
%else
%define stlport_abi_lockin 0
%endif
-# undef to build with icedtea
-%define jdk_is_gcj 1
%if %{stlport_abi_lockin}
%define stlflags --with-stlport
@@ -24,12 +22,6 @@
%define stlflags --without-stlport
%endif
-%if %{jdk_is_gcj}
-%define java_devel java-1.5.0-devel
-%else
-%define java_devel java-1.7.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 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
@@ -56,8 +48,9 @@
Source4: http://people.redhat.com/caolanm/templates/redhat-templates.tar.gz
Source5: http://www.openoffice.org/nonav/issues/showattachment.cgi/50963/bengali.sdf
Source6: http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
+Source7: redhat-registry.tar.gz
BuildRequires: zip, findutils, autoconf, flex, bison, icu, gcc-c++, gdb
-BuildRequires: binutils, %{java_devel}, boost-devel, zlib-devel, vigra-devel
+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
@@ -73,70 +66,63 @@
Patch0: openoffice.org-simple-crash_report.sh
Patch1: openoffice.org-multiliblauncher.sh
-Patch2: AutoSaveRecovery.xcu
-Patch3: RegisterAndLicence.xcu
-Patch4: MathPrintOptions.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.87.rh151357.setlangtolocale.patch
+Patch2: openoffice.org.langpack-cjk.template
+Patch3: openoffice.org.langpack-help.template
+Patch4: openoffice.org.langpack-common.template
+Patch5: openoffice.org.langpack-acor.template
+Patch6: openoffice.org.langpack-ctl.template
+Patch7: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
%if %{gtkprintui}
-Patch12: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
+Patch8: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
%endif
-Patch13: openoffice.org-2.0.0.ooo83140.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: pseudoworkspace.valgrind1.patch
-Patch21: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch22: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
-Patch23: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
-Patch24: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
-Patch25: openoffice.org-3.0.0.ooo87882.lingucomponent.systemdicts.patch
-Patch26: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
-Patch27: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
-Patch28: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch29: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
-Patch30: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch31: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch32: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
-Patch33: openoffice.org-2.2.1.ooo7065.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.4.0.oooXXXXX.solenv.paths.patch
-Patch39: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch40: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
-Patch41: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
-Patch42: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
-Patch43: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch44: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
-Patch45: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
-Patch46: openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
-Patch47: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
-Patch48: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch49: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
-Patch50: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
-Patch51: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch52: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
-Patch53: openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch
-Patch54: openoffice.org-3.0.0.ooo90071.chart2.negativecount.patch
-Patch55: openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch
-Patch56: openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch
-Patch57: openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch
-Patch58: openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch
-Patch59: openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch
-Patch60: openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch
-Patch61: openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch
-Patch62: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
-Patch63: openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch
+Patch9: openoffice.org-2.0.0.ooo83140.jvmfwk.retryjvm.patch
+Patch10: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
+Patch11: openoffice.org-1.9.115.ooo69368.fixxmlsec.patch
+Patch12: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch13: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch14: openoffice.org-2.0.2.rh188467.printingdefaults.patch
+Patch15: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch16: pseudoworkspace.valgrind1.patch
+Patch17: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch18: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
+Patch19: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch20: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch21: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
+Patch22: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
+Patch23: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch24: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
+Patch25: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
+Patch26: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
+Patch27: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
+Patch28: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
+Patch29: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
+Patch30: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
+Patch31: openoffice.org-2.3.0.ooo76649.httpencoding.patch
+Patch32: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
+Patch33: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
+Patch34: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
+Patch35: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
+Patch36: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
+Patch37: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
+Patch38: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+Patch39: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
+Patch40: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
+Patch41: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
+Patch42: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
+Patch43: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
+Patch44: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
+Patch45: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch46: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
+Patch47: openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch
+Patch48: openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch
+Patch49: openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch
+Patch50: openoffice.org-3.0.0.ooo90178.tools.fixmacro.patch
+Patch51: openoffice.org-3.0.0.oooXXXXX.vcl.cairomaxclip.patch
+Patch52: openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch
+Patch53: openoffice.org-3.0.0.ooo90612.sd.insertpasswordedfile.patch
+Patch54: openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch
+Patch55: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
+Patch56: openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/openoffice.org
@@ -256,8 +242,8 @@
Summary: Create Wiki articles on MediaWiki servers with %{name}
Group: Applications/Productivity
Requires: %{name}-writer-core = %{epoch}:%{version}-%{release}
-Requires: jakarta-commons-codec jakarta-commons-httpclient
-Requires: jakarta-commons-lang jakarta-commons-logging
+Requires: jakarta-commons-codec, jakarta-commons-httpclient
+Requires: jakarta-commons-lang, jakarta-commons-logging
%description wiki-publisher
The Wiki Publisher enables you to create Wiki articles on MediaWiki servers
@@ -1221,61 +1207,58 @@
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 .rh151357.setlangtolocale.patch
+%patch7 -p1 -b .rh151357.setlangtolocale.patch
%if %{gtkprintui}
-%patch12 -p1 -b .rh127576.gtkunixprintdialog.patch
+%patch8 -p1 -b .rh127576.gtkunixprintdialog.patch
%endif
-%patch13 -p1 -b .ooo83140.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 .pseudoworkspace.valgrind1.patch
-%patch21 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch22 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
-%patch23 -p1 -b .ooo65491.psprint.enablenups.patch
-cat %{PATCH24} >> svtools/source/dialogs/localize.sdf
-%patch25 -p1 -b .ooo87882.lingucomponent.systemdicts.patch
-%patch26 -p1 -b .ooo73201.sw.a11yloadcrash.patch
-%patch27 -p1 -b .ooo73863.vcl.imcommit.patch
-%patch28 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch29 -p0 -b .ooo68717.gstreamer.video.patch
-%patch30 -p1 -b .ooo63159.sal.dtype.patch
-%patch31 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch32 -p1 -b .ooo80816.selinux.bridges.patch
-%patch33 -p1 -b .ooo7065.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
-%patch39 -p1 -b .rh133741.alwaysgtk.vcl.patch
-%patch40 -p1 -b .ooo85429.sw.a11ycrash.patch
-%patch41 -p1 -b .ooo85448.emptyrpath.patch
-%patch42 -p1 -b .ooo85921.sd.editmasterundermouse.patch
-%patch43 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch44 -p1 -b .oooXXXXX.psprint.debugcups.patch
-%patch45 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
-%patch46 -p1 -b .ooo87604.fixupsystemhunspell.patch
-%patch47 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
-%patch48 -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch49 -p1 -b .ooo6087.sc.sheetnames.patch
-%patch50 -p1 -b .ooo89002.vcl.symbolfonts.patch
-%patch51 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch52 -p1 -b .ooo87970.vcl.samenamesubs.patch
-%patch53 -p1 -b .ooo90055.swext.allowadmin.patch
-%patch54 -p1 -b .ooo90071.chart2.negativecount.patch
-%patch55 -p1 -b .oooXXXXX.odk.3layer.patch
-%patch56 -p1 -b .ooo90037.vcl.cairotransforms.patch
-%patch57 -p1 -b .ooo90178.tools.fixmacro.patch
-%patch58 -p1 -b .oooXXXXX.vcl.cairomaxclip.patch
-%patch59 -p1 -b .ooo82545.np_sdk.x86_64.patch
-%patch60 -p1 -b .ooo90612.sd.insertpasswordedfile.patch
-%patch61 -p1 -b .ooo90306.sw.wrongprotection.patch
-%patch62 -p1 -b .ooo48400.svx.fixspelling.patch
-%patch63 -p1 -b .ooo90697.sd.a11ycrash.patch
+%patch9 -p1 -b .ooo83140.jvmfwk.retryjvm.patch
+%patch10 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
+%patch11 -p1 -b .ooo69368.fixxmlsec.patch
+%patch12 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch13 -p1 -b .ooo58606.sw.pre-edit.patch
+%patch14 -p1
+%patch15 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch16 -p1 -b .pseudoworkspace.valgrind1.patch
+%patch17 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch18 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
+%patch19 -p1 -b .ooo65491.psprint.enablenups.patch
+cat %{PATCH20} >> svtools/source/dialogs/localize.sdf
+%patch21 -p1 -b .ooo73201.sw.a11yloadcrash.patch
+%patch22 -p1 -b .ooo73863.vcl.imcommit.patch
+%patch23 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
+%patch24 -p0 -b .ooo68717.gstreamer.video.patch
+%patch25 -p1 -b .ooo63159.sal.dtype.patch
+%patch26 -p1 -b .ooo76393.sal.dynamicsection.patch
+%patch27 -p1 -b .ooo80816.selinux.bridges.patch
+%patch28 -p1 -b .ooo7065.sw.titlepagedialog.patch
+%patch29 -p1 -b .ooo80257.sd.textonlystyle.patch
+tar xzf %{PATCH30}
+%patch31 -p1 -b .ooo76649.httpencoding.patch
+%patch32 -p1 -b .ooo83878.unopkg.enablelinking.patch
+%patch33 -p1
+%patch34 -p1 -b .rh133741.alwaysgtk.vcl.patch
+%patch35 -p1 -b .ooo85429.sw.a11ycrash.patch
+%patch36 -p1 -b .ooo85448.emptyrpath.patch
+%patch37 -p1 -b .ooo85921.sd.editmasterundermouse.patch
+%patch38 -p1 -b .ooo86080.unopkg.bodge.patch
+%patch39 -p1 -b .oooXXXXX.psprint.debugcups.patch
+%patch40 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
+%patch41 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
+%patch42 -p1 -b .ooo88341.sc.verticalboxes.patch
+%patch43 -p1 -b .ooo6087.sc.sheetnames.patch
+%patch44 -p1 -b .ooo89002.vcl.symbolfonts.patch
+%patch45 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch46 -p1 -b .ooo87970.vcl.samenamesubs.patch
+%patch47 -p1 -b .ooo90055.swext.allowadmin.patch
+%patch48 -p1 -b .oooXXXXX.odk.3layer.patch
+%patch49 -p1 -b .ooo90037.vcl.cairotransforms.patch
+%patch50 -p1 -b .ooo90178.tools.fixmacro.patch
+%patch51 -p1 -b .oooXXXXX.vcl.cairomaxclip.patch
+%patch52 -p1 -b .ooo82545.np_sdk.x86_64.patch
+%patch53 -p1 -b .ooo90612.sd.insertpasswordedfile.patch
+%patch54 -p1 -b .ooo90306.sw.wrongprotection.patch
+%patch55 -p1 -b .ooo48400.svx.fixspelling.patch
+%patch56 -p1 -b .ooo90697.sd.a11ycrash.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1284,16 +1267,26 @@
cd config_office
autoconf
export PATH=$PATH:/usr/sbin
-%configure --with-build-version="Ver: %{version}-%{release}" --with-unix-wrapper=%{name} --with-use-shell=bash --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-Xaw --disable-gnome-vfs --enable-gio --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --with-vba-package-format="builtin" --enable-dbus --with-system-libs --with-system-headers --with-system-apache-commons --with-commons-logging-jar=/usr/share/java/commons-logging.jar --with-system-mozilla --with-system-libtextcat --without-myspell-dicts --without-system-mspack --without-fonts --without-gpc --without-agg --without-ppds --without-afms --without-writer2latex %{stlflags} --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS" --disable-pdfimport --enable-presenter-screen --enable-opengl
+%configure \
+ --with-build-version="Ver: %{version}-%{release}" --with-unix-wrapper=%{name} \
+ --with-use-shell=bash --disable-ldap --disable-crashdump --disable-epm \
+ --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-Xaw \
+ --disable-gnome-vfs --enable-gio --enable-gstreamer --enable-symbols \
+ --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba \
+ --with-vba-package-format="builtin" --enable-dbus --with-system-libs \
+ --with-system-headers --with-system-apache-commons \
+ --with-commons-logging-jar=/usr/share/java/commons-logging.jar \
+ --with-system-mozilla --with-system-libtextcat --with-system-dicts \
+ --with-dict-path=/usr/share/myspell --without-myspell-dicts \
+ --without-system-mspack --without-fonts --without-gpc --without-agg \
+ --without-ppds --without-afms --without-writer2latex %{stlflags} \
+ --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS" \
+ --disable-pdfimport --enable-presenter-screen --enable-opengl
cd ..
./bootstrap
source Linux*Env.Set.sh
#unneccessary to build for both hash types
unset HAVE_LD_HASH_STYLE
-%if ! %{jdk_is_gcj}
-#set target to 5 so that gcj can still be used as the jvm when built with icedtea
-export JAVACOMPILER="$JAVACOMPILER -target 5"
-%endif
#faster build
export nodep=true
export NO_HIDS=true
@@ -1377,7 +1370,7 @@
%install
rm -rf $RPM_BUILD_ROOT
#mine eyes burneth
-%define PLATFORM_ID %{expand:%%(LD_LIBRARY_PATH=`echo %{_builddir}/%{?buildsubdir}/solver/300/unxlng*.pro/lib` %{_builddir}/%{?buildsubdir}/sal/unxlng*.pro/bin/gen_makefile | sed -e "s/RTL_.*:=//g" | xargs | sed -e "s/ /_/g" | sed -r "s/[A-Z]+/\\L&/g")}
+%define PLATFORM_ID %{expand:%%(LD_LIBRARY_PATH=`echo %{_builddir}/%{?buildsubdir}/solver/300/unxlng*.pro/lib`; if [ -e %{_builddir}/%{?buildsubdir}/sal/unxlng*.pro/bin/gen_makefile ]; then %{_builddir}/%{?buildsubdir}/sal/unxlng*.pro/bin/gen_makefile; else echo Linux_noarch; fi | sed -e "s/RTL_.*:=//g" | xargs | sed -e "s/ /_/g" | sed -r "s/[A-Z]+/\\L&/g")}
source Linux*Env.Set.sh
#figure out the icon version
export LONGICON`grep "PRODUCTVERSION[ ]*=[ ]*" sysui/desktop/productversion.mk | sed -e "s/ //g"`
@@ -1566,21 +1559,15 @@
rm -rf $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-UseOOoFileDialogs.xcu
#remove dictooo stuff which we disabled in configure
rm -rf $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-dicooo.xcu
-#default autorecovery settings
-mkdir -p $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Recovery
-cp %{PATCH2} $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Recovery
-#don't prompt user to agree to license
-mkdir -p $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Setup
-cp %{PATCH3} $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Setup
#don't prompt user to register
sed -i -e "s#>Patch.*# xsi:nil=\"true\"/>#g" $RPM_BUILD_ROOT/%{oooinstdir}/share/registry/data/org/openoffice/Office/Common.xcu
sed -i -e "s#>Patch.*# xsi:nil=\"true\"/>#g" $RPM_BUILD_ROOT/%{brinstdir}/share/registry/data/org/openoffice/Office/Common.xcu
+#default autorecovery settings
+#don't prompt user to agree to license
#libtextcat fingerprint location
-mkdir -p $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Paths
-cp %{PATCH5} $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Paths
#rhbz#451512 set better math print options
-mkdir -p $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Math
-cp %{PATCH6} $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Math
+tar xzf %{SOURCE7} -C $RPM_BUILD_ROOT/%{basisinstdir}/share
+popd
#add the debugging libsalalloc_malloc.so.3 library
cp -f solver/%{OFFICEUPD}/unxlng*.pro/lib/libsalalloc_malloc.so.3 $RPM_BUILD_ROOT/%{ureinstdir}/lib
@@ -1684,26 +1671,26 @@
i=0
while [ $i -lt ${#langpackdetails[@]} ]; do
lang=${langpackdetails[$i]}
- sed -e "s/LANG/$lang/g" %{PATCH8} > $lang.filelist
+ sed -e "s/LANG/$lang/g" %{PATCH4} > $lang.filelist
i=$[i+1]
help=${langpackdetails[$i]}
if [ "$help" = "help" ]; then
- sed -e "s/LANG/$lang/g" %{PATCH7} >> $lang.filelist
+ sed -e "s/LANG/$lang/g" %{PATCH3} >> $lang.filelist
fi
i=$[i+1]
lingu=${langpackdetails[$i]}
if [ ! "$lingu" = "noacor" ]; then
- sed -e "s/LINGUPATTERN/$lingu/g" %{PATCH9} >> $lang.filelist
+ sed -e "s/LINGUPATTERN/$lingu/g" %{PATCH5} >> $lang.filelist
fi
i=$[i+1]
type=${langpackdetails[$i]}
if [ "$type" = "cjk" ]; then
- sed -e "s/LANG/$lang/g" %{PATCH6} >> $lang.filelist
+ sed -e "s/LANG/$lang/g" %{PATCH2} >> $lang.filelist
fi
#rh217269 upstream made a decision to sequence check all ctl languages
#I think this is wrong, and only Thai should be sequence checked
if [ "$type" = "ctlseqcheck" ]; then
- sed -e "s/LANG/$lang/g" %{PATCH10} >> $lang.filelist
+ sed -e "s/LANG/$lang/g" %{PATCH6} >> $lang.filelist
fi
if [ "$type" = "ctl" ]; then
rm $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_$lang.xcu
@@ -1716,6 +1703,9 @@
tar xzf %{SOURCE3} -C $RPM_BUILD_ROOT/%{basisinstdir}/share
tar xzf %{SOURCE4} -C $RPM_BUILD_ROOT/%{basisinstdir}/share
+#remove it in case we didn't build with gcj
+rm -f $RPM_BUILD_ROOT/%{basisinstdir}/program/classes/sandbox.jar
+
#remove evolution 1 address book driver
rm -f $RPM_BUILD_ROOT/%{basisinstdir}/program/libevoab1.so
@@ -2038,9 +2028,6 @@
%{basisinstdir}/program/classes/letter.jar
%{basisinstdir}/program/classes/officebean.jar
%{basisinstdir}/program/classes/report.jar
-%if ! %{jdk_is_gcj}
-%{basisinstdir}/program/classes/sandbox.jar
-%endif
%{basisinstdir}/program/classes/sdbc_hsqldb.jar
%{basisinstdir}/program/classes/ScriptFramework.jar
%{basisinstdir}/program/classes/ScriptProviderForBeanShell.jar
@@ -3464,11 +3451,15 @@
%{python_py_sitearch}/unohelper.py*
%changelog
-* Mon Jun 16 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.19-2
+* Wed Jun 18 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.20-1
+- next version
- Resolves: rhbz#450661 openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch
- Resolves: rhbz#448464 openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
- Resolves: rhbz#450930 openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch
- Resolves: rhbz#451512 set better math default print options
+- drop integrated openoffice.org-3.0.0.ooo87882.lingucomponent.systemdicts.patch
+- drop integrated openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
+- drop integrated openoffice.org-3.0.0.ooo90071.chart2.negativecount.patch
* Wed Jun 11 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.19-1
- next version
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -r1.296 -r1.297
--- sources 11 Jun 2008 13:33:20 -0000 1.296
+++ sources 19 Jun 2008 08:21:28 -0000 1.297
@@ -4,4 +4,5 @@
e3a0b76dcd876f3d721ee7183729153d unowinreg.dll
f0cda31fe18bf9289629a321663031b8 redhat-templates.tar.gz
0c0e868b34329d90a7c9a92f1704775c bengali.sdf
-eae20165d3f974588db7b8d4e7142250 DEV300_m19.tar.bz2
+6df072febfe7897c0861178236228b0a DEV300_m20.tar.bz2
+0cedbc1176b95a6079dbd2759fa6cd36 redhat-registry.tar.gz
--- openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch DELETED ---
--- openoffice.org-3.0.0.ooo87882.lingucomponent.systemdicts.patch DELETED ---
--- openoffice.org-3.0.0.ooo90071.chart2.negativecount.patch DELETED ---
- Previous message (by thread): rpms/openais/devel revision-1552.patch, NONE, 1.1 openais.spec, 1.25, 1.26
- Next message (by thread): rpms/gtkwave/devel .cvsignore, 1.50, 1.51 gtkwave.spec, 1.54, 1.55 sources, 1.50, 1.51
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list