rpms/openoffice.org/devel openoffice.org-multiliblauncher.sh, NONE, 1.1 openoffice.org.spec, 1.1427, 1.1428
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Wed Feb 13 13:48:26 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8413
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-multiliblauncher.sh
Log Message:
Resolves: rhbz#432368 do a better split
--- NEW FILE openoffice.org-multiliblauncher.sh ---
#!/bin/sh
OOO_ARCH=$(uname -m)
case $OOO_ARCH in
x86_64 | ia64 | s390 )
OOO_LIB_DIR="/usr/lib64"
SECONDARY_LIB_DIR="/usr/lib"
;;
* )
OOO_LIB_DIR="/usr/lib"
SECONDARY_LIB_DIR="/usr/lib64"
;;
esac
if [ ! -x $OOO_LIB_DIR/openoffice.org/program/LAUNCHER ]; then
OOO_LIB_DIR="$SECONDARY_LIB_DIR"
fi
exec $OOO_LIB_DIR/openoffice.org/program/LAUNCHER "$@"
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1427
retrieving revision 1.1428
diff -u -r1.1427 -r1.1428
--- openoffice.org.spec 13 Feb 2008 10:36:36 -0000 1.1427
+++ openoffice.org.spec 13 Feb 2008 13:47:43 -0000 1.1428
@@ -57,7 +57,7 @@
Source5: http://www.openoffice.org/nonav/issues/showattachment.cgi/50963/bengali.sdf
Source6: http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
BuildRequires: tcsh, zip, findutils, autoconf, flex, bison, ant, icu, gcc-c++
-BuildRequires: perl-Compress-Zlib, binutils, unixODBC-devel, xalan-j2
+BuildRequires: perl-Compress-Zlib, binutils, unixODBC-devel, xalan-j2, bc
BuildRequires: gdb, %{java_devel}, zlib-devel, vigra-devel, hsqldb, libXt-devel
BuildRequires: freetype-devel, gtk2-devel, gnome-vfs2-devel, cups-devel, bsh
BuildRequires: libcurl-devel, boost-devel, python-devel, expat-devel
@@ -70,77 +70,78 @@
BuildRequires: xerces-j2, hyphen-devel, openssl-devel
Patch0: openoffice.org-simple-crash_report.sh
-Patch1: AutoSaveRecovery.xcu
-Patch2: RegisterAndLicence.xcu
-Patch3: AutoSaveCommon.xcu
-Patch4: libtextcat.xcu
-Patch5: openoffice.org.langpack-cjk.template
-Patch6: openoffice.org.langpack-help.template
-Patch7: openoffice.org.langpack-common.template
-Patch8: openoffice.org.langpack-acor.template
-Patch9: openoffice.org.langpack-ctl.template
-Patch10: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
-Patch11: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
+Patch1: openoffice.org-multiliblauncher.sh
+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}
-Patch12: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
+Patch13: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
%endif
-Patch13: openoffice.org-2.0.0.rh171692.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: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
-Patch21: pseudoworkspace.valgrind1.patch
-Patch22: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch23: openoffice.org-2.0.4.rh217065.syncbackspace.patch
-Patch24: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
-Patch25: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
-Patch26: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
-Patch27: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch
-Patch28: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
-Patch29: workspace.tl37.patch
-Patch30: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
-Patch31: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
-Patch32: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
-Patch33: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch34: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
-Patch35: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch36: openoffice.org-2.2.0.rh232389.tango.patch
-Patch37: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch38: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
-Patch39: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
-Patch40: openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
-Patch41: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
-Patch42: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
-Patch43: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
-Patch44: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
-Patch45: workspace.unifysound01.patch
-Patch46: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch47: openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
-Patch48: openoffice.org-2.3.0.ooo76649.httpencoding.patch
-Patch49: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
-Patch50: openoffice.org-2.3.1.ooo81307.sw.word2.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.oooXXXXX.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.oooXXXXX.ucb.newneon.patch
+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
+Patch32: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
+Patch33: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
+Patch34: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch35: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
+Patch36: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
+Patch37: openoffice.org-2.2.0.rh232389.tango.patch
+Patch38: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
+Patch39: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
+Patch40: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
+Patch41: openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
+Patch42: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
+Patch43: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
+Patch44: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
+Patch45: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
+Patch46: workspace.unifysound01.patch
+Patch47: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+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.oooXXXXX.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.oooXXXXX.ucb.newneon.patch
%define instdir %{_libdir}/openoffice.org
@@ -1034,68 +1035,68 @@
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
-%patch10 -p1 -b .rh161886.rpath.desktop.patch
-%patch11 -p1 -b .rh151357.setlangtolocale.patch
+%patch11 -p1 -b .rh161886.rpath.desktop.patch
+%patch12 -p1 -b .rh151357.setlangtolocale.patch
%if %{gtkprintui}
-%patch12 -p1 -b .rh127576.gtkunixprintdialog.patch
+%patch13 -p1 -b .rh127576.gtkunixprintdialog.patch
%endif
-%patch13 -p1 -b .rh171692.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 .ooo69051.vcl.singlekeypress.patch
-%patch21 -p1 -b .pseudoworkspace.valgrind1.patch
-%patch22 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch23 -p1 -b .rh217065.syncbackspace.patch
-%patch24 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
-%patch25 -p1 -b .ooo65491.psprint.enablenups.patch
-cat %{PATCH26} >> svtools/source/dialogs/localize.sdf
-%patch27 -p1 -b .oooXXXXX.lingucomponent.systemdicts.patch
-%patch28 -p1 -b .rh217269.officecfg.nosequencecheck.patch
-%patch29 -p1 -b .tl37.patch
-%patch30 -p1 -b .ooo73201.sw.a11yloadcrash.patch
-%patch31 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
-%patch32 -p1 -b .ooo73863.vcl.imcommit.patch
-%patch33 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch34 -p0 -b .ooo68717.gstreamer.video.patch
-%patch35 -p1 -b .ooo63159.sal.dtype.patch
-%patch36 -p1 -b .rh232389.tango.patch
-%patch37 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch38 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
-%patch39 -p1 -b .ooo80816.selinux.bridges.patch
-%patch40 -p1 -b .ooo78971.xmloff.outofrange.patch
-%patch41 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
-%patch42 -p1 -b .ooo79481.sw.rowordcount.patch
-%patch43 -p1 -b .ooo80257.sd.textonlystyle.patch
-tar xzf %{PATCH44}
-%patch45 -p1 -b .workspace.unifysound01.patch
-%patch46 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch47 -p1 -b .ooo81321.cppu.silencewarnings.patch
-%patch48 -p1 -b .ooo76649.httpencoding.patc
-%patch49 -p1 -b .ooo82966.svx.missing3d.patch
-%patch50 -p1 -b .ooo81307.sw.word2.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 .oooXXXXX.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 .oooXXXXX.ucb.newneon.patch
+%patch14 -p1 -b .rh171692.jvmfwk.retryjvm.patch
+%patch15 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
+%patch16 -p1 -b .ooo69368.fixxmlsec.patch
+%patch17 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch18 -p1 -b .ooo58606.sw.pre-edit.patch
+%patch19 -p1
+%patch20 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch21 -p1 -b .ooo69051.vcl.singlekeypress.patch
+%patch22 -p1 -b .pseudoworkspace.valgrind1.patch
+%patch23 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch24 -p1 -b .rh217065.syncbackspace.patch
+%patch25 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
+%patch26 -p1 -b .ooo65491.psprint.enablenups.patch
+cat %{PATCH27} >> svtools/source/dialogs/localize.sdf
+%patch28 -p1 -b .oooXXXXX.lingucomponent.systemdicts.patch
+%patch29 -p1 -b .rh217269.officecfg.nosequencecheck.patch
+%patch30 -p1 -b .tl37.patch
+%patch31 -p1 -b .ooo73201.sw.a11yloadcrash.patch
+%patch32 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
+%patch33 -p1 -b .ooo73863.vcl.imcommit.patch
+%patch34 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
+%patch35 -p0 -b .ooo68717.gstreamer.video.patch
+%patch36 -p1 -b .ooo63159.sal.dtype.patch
+%patch37 -p1 -b .rh232389.tango.patch
+%patch38 -p1 -b .ooo76393.sal.dynamicsection.patch
+%patch39 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
+%patch40 -p1 -b .ooo80816.selinux.bridges.patch
+%patch41 -p1 -b .ooo78971.xmloff.outofrange.patch
+%patch42 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
+%patch43 -p1 -b .ooo79481.sw.rowordcount.patch
+%patch44 -p1 -b .ooo80257.sd.textonlystyle.patch
+tar xzf %{PATCH45}
+%patch46 -p1 -b .workspace.unifysound01.patch
+%patch47 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%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 .oooXXXXX.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 .oooXXXXX.ucb.newneon.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1141,11 +1142,12 @@
#convert _smp_mflags to dmake equivalent
SMP_MFLAGS=%{?_smp_mflags}
-SMP_MFLAGS=-P$[${SMP_MFLAGS/-j/}]
-if [ "$SMP_MFLAGS" == "-P0" ]; then SMP_MFLAGS=-P2; fi
-XSMP_MFLAGS=$[${SMP_MFLAGS/-P/}]
-if [ $XSMP_MFLAGS -gt 4 ]; then XSMP_MFLAGS=4; fi
-XSMP_MFLAGS=-P$XSMP_MFLAGS
+SMP_MFLAGS=$[${SMP_MFLAGS/-j/}]
+if [ $SMP_MFLAGS -lt 2 ]; then SMP_MFLAGS=2; fi
+DMAKE_SMP_MFLAGS=`dc -e "$SMP_MFLAGS v p"`
+BUILD_SMP_MFLAGS=`dc -e "$SMP_MFLAGS $DMAKE_SMP_MFLAGS / p"`
+DMAKE_SMP_MFLAGS=-P$DMAKE_SMP_MFLAGS
+BUILD_SMP_MFLAGS=-P$BUILD_SMP_MFLAGS
#just in case you have a >16 proc box
export MAXPROCESSLIMIT=65535
#get core dumps
@@ -1153,7 +1155,7 @@
#build translation tools and apply extra translations, so
#this can be removed when these translations are upstreamed
cd transex3/prj
-if ! build --dlv_switch -link --all $XSMP_MFLAGS -- $SMP_MFLAGS -s; then
+if ! build --dlv_switch -link --all $BUILD_SMP_MFLAGS -- $DMAKE_SMP_MFLAGS -s; then
echo bt > gdbcmds
find ../.. -name "core.*" -exec gdb --batch -nx -x gdbcmds --core {} \;
build --dlv_switch -link --all
@@ -1165,7 +1167,7 @@
#build OOo, on failure make a stab at debugging the crash if any, and
#rebuild un-parallel
cd instsetoo_native/util
-if ! build --dlv_switch -link --all $SMP_MFLAGS -- $SMP_MFLAGS -s; then
+if ! build --dlv_switch -link --all $BUILD_SMP_MFLAGS -- $DMAKE_SMP_MFLAGS -s; then
echo bt > gdbcmds
find ../.. -name "core.*" -exec gdb --batch -nx -x gdbcmds --core {} \;
build --dlv_switch -link --all
@@ -1300,13 +1302,13 @@
#add our custom configuration options
#default GTK fpicker
-$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH1}
-#don't prompt user to agree to license
$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH2}
-#default autosave settings
+#don't prompt user to agree to license
$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH3}
-#libtextcat fingerprint location
+#default autosave settings
$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH4}
+#libtextcat fingerprint location
+$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH5}
#rhbz#151356 set a consistent bootstrap value, unfortunately upstream finally picked a different one
sed -i -e s/org2/org2.0/ $RPM_BUILD_ROOT/%{instdir}/program/bootstraprc
@@ -1412,24 +1414,24 @@
i=0
while [ $i -lt ${#langpackdetails[@]} ]; do
lang=${langpackdetails[$i]}
- sed -e "s/LANG/$lang/g" %{PATCH7} > $lang.filelist
+ sed -e "s/LANG/$lang/g" %{PATCH8} > $lang.filelist
i=$[i+1]
help=${langpackdetails[$i]}
if [ "$help" = "help" ]; then
- sed -e "s/LANG/$lang/g" %{PATCH6} >> $lang.filelist
+ sed -e "s/LANG/$lang/g" %{PATCH7} >> $lang.filelist
fi
i=$[i+1]
lingu=${langpackdetails[$i]}
if [ ! "$lingu" = "noacor" ]; then
- sed -e "s/LINGUPATTERN/$lingu/g" %{PATCH8} >> $lang.filelist
+ sed -e "s/LINGUPATTERN/$lingu/g" %{PATCH9} >> $lang.filelist
fi
i=$[i+1]
type=${langpackdetails[$i]}
if [ "$type" = "ctl" ]; then
- sed -e "s/LANG/$lang/g" %{PATCH9} >> $lang.filelist
+ sed -e "s/LANG/$lang/g" %{PATCH10} >> $lang.filelist
fi
if [ "$type" = "cjk" ]; then
- sed -e "s/LANG/$lang/g" %{PATCH5} >> $lang.filelist
+ sed -e "s/LANG/$lang/g" %{PATCH6} >> $lang.filelist
fi
i=$[i+1]
done
@@ -1511,48 +1513,50 @@
#make up some /usr/bin scripts
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
-echo \#\!/bin/sh > $RPM_BUILD_ROOT/%{_bindir}/openoffice.org
-echo exec %{instdir}/program/soffice \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/openoffice.org
-chmod a+x $RPM_BUILD_ROOT/%{_bindir}/openoffice.org
-cp $RPM_BUILD_ROOT/%{_bindir}/openoffice.org $RPM_BUILD_ROOT/%{_bindir}/openoffice.org-2.0
-cp $RPM_BUILD_ROOT/%{_bindir}/openoffice.org $RPM_BUILD_ROOT/%{_bindir}/openoffice.org-1.9
-
echo \#\!/bin/sh > $RPM_BUILD_ROOT/%{_bindir}/ooffice
-echo exec %{instdir}/program/soffice \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/ooffice
+echo exec openoffice.org \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/ooffice
chmod a+x $RPM_BUILD_ROOT/%{_bindir}/ooffice
echo \#\!/bin/sh > $RPM_BUILD_ROOT/%{_bindir}/ooviewdoc
-echo exec %{instdir}/program/soffice -view \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/ooviewdoc
+echo exec openoffice.org -view \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/ooviewdoc
chmod a+x $RPM_BUILD_ROOT/%{_bindir}/ooviewdoc
echo \#\!/bin/sh > $RPM_BUILD_ROOT/%{_bindir}/oowriter
-echo exec %{instdir}/program/soffice -writer \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/oowriter
+echo exec openoffice.org -writer \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/oowriter
chmod a+x $RPM_BUILD_ROOT/%{_bindir}/oowriter
echo \#\!/bin/sh > $RPM_BUILD_ROOT/%{_bindir}/oocalc
-echo exec %{instdir}/program/soffice -calc \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/oocalc
+echo exec openoffice.org -calc \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/oocalc
chmod a+x $RPM_BUILD_ROOT/%{_bindir}/oocalc
echo \#\!/bin/sh > $RPM_BUILD_ROOT/%{_bindir}/ooimpress
-echo exec %{instdir}/program/soffice -impress \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/ooimpress
+echo exec openoffice.org -impress \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/ooimpress
chmod a+x $RPM_BUILD_ROOT/%{_bindir}/ooimpress
echo \#\!/bin/sh > $RPM_BUILD_ROOT/%{_bindir}/oodraw
-echo exec %{instdir}/program/soffice -draw \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/oodraw
+echo exec openoffice.org -draw \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/oodraw
chmod a+x $RPM_BUILD_ROOT/%{_bindir}/oodraw
echo \#\!/bin/sh > $RPM_BUILD_ROOT/%{_bindir}/oomath
-echo exec %{instdir}/program/soffice -math \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/oomath
+echo exec openoffice.org -math \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/oomath
chmod a+x $RPM_BUILD_ROOT/%{_bindir}/oomath
echo \#\!/bin/sh > $RPM_BUILD_ROOT/%{_bindir}/oobase
-echo exec %{instdir}/program/soffice -base \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/oobase
+echo exec openoffice.org -base \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/oobase
chmod a+x $RPM_BUILD_ROOT/%{_bindir}/oobase
-echo \#\!/bin/sh > $RPM_BUILD_ROOT/%{_bindir}/unopkg
-echo exec %{instdir}/program/unopkg \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/unopkg
+cp -f %{PATCH1} $RPM_BUILD_ROOT/%{_bindir}/unopkg
+sed -i -e "s/LAUNCHER/unopkg/g" $RPM_BUILD_ROOT/%{_bindir}/unopkg
chmod a+x $RPM_BUILD_ROOT/%{_bindir}/unopkg
+cp -f %{PATCH1} $RPM_BUILD_ROOT/%{_bindir}/openoffice.org
+sed -i -e "s/LAUNCHER/soffice/g" $RPM_BUILD_ROOT/%{_bindir}/openoffice.org
+chmod a+x $RPM_BUILD_ROOT/%{_bindir}/openoffice.org
+
+cp $RPM_BUILD_ROOT/%{_bindir}/openoffice.org $RPM_BUILD_ROOT/%{_bindir}/openoffice.org-2.0
+cp $RPM_BUILD_ROOT/%{_bindir}/openoffice.org $RPM_BUILD_ROOT/%{_bindir}/openoffice.org-1.9
+
+
pushd $RPM_BUILD_ROOT/%{instdir}/share/xdg/
chmod u+w *.desktop
# rhbz#156677 use GenericNames
@@ -2865,6 +2869,9 @@
%changelog
+* Wed Feb 13 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-7.2
+- some multilib helping
+
* Wed Feb 13 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-7.1
- Resolves: rhbz#432368 parallel build is err... "a little" aggressive
- next milestone
More information about the fedora-extras-commits
mailing list