rpms/openoffice.org/devel openoffice.org-3.0.0.ooo89172.filter.string.patch, NONE, 1.1 openoffice.org.spec, 1.1497, 1.1498 AutoSaveCommon.xcu, 1.1, NONE openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch, 1.1, NONE
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Fri May 9 07:43:57 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18341
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-3.0.0.ooo89172.filter.string.patch
Removed Files:
AutoSaveCommon.xcu
openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
Log Message:
add openoffice.org-3.0.0.ooo89172.filter.string.patch
openoffice.org-3.0.0.ooo89172.filter.string.patch:
--- NEW FILE openoffice.org-3.0.0.ooo89172.filter.string.patch ---
Index: source/pdfimport/wrapper/wrapper.cxx
===================================================================
RCS file: /cvs/framework/filter/source/pdfimport/wrapper/wrapper.cxx,v
retrieving revision 1.4
diff -u -r1.4 wrapper.cxx
--- openoffice.org.orig/filter/source/pdfimport/wrapper/wrapper.cxx 24 Apr 2008 18:34:11 -0000 1.4
+++ openoffice.org/filter/source/pdfimport/wrapper/wrapper.cxx 8 May 2008 10:46:00 -0000
@@ -70,6 +70,7 @@
#include <boost/scoped_array.hpp>
#include <hash_map>
+#include <string.h>
#include "rtl/bootstrap.h"
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1497
retrieving revision 1.1498
diff -u -r1.1497 -r1.1498
--- openoffice.org.spec 6 May 2008 18:55:18 -0000 1.1497
+++ openoffice.org.spec 9 May 2008 07:43:19 -0000 1.1498
@@ -72,71 +72,70 @@
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.87.rh151357.setlangtolocale.patch
+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.87.rh151357.setlangtolocale.patch
%if %{gtkprintui}
-Patch12: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
+Patch11: 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: 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.rh217269.officecfg.nosequencecheck.patch
-Patch27: workspace.tl37.patch
-Patch28: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
-Patch29: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
-Patch30: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch31: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
-Patch32: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch33: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch34: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
-Patch35: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
-Patch36: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
-Patch37: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
-Patch38: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
-Patch39: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch40: openoffice.org-2.3.0.ooo76649.httpencoding.patch
-Patch41: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch42: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
-Patch43: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
-Patch44: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
-Patch45: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
-Patch46: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch47: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
-Patch48: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
-Patch49: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
-Patch50: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
-Patch51: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch52: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
-Patch53: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
-Patch54: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
-Patch55: openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
-Patch56: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
-Patch57: openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
-Patch58: openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
-Patch59: openoffice.org-3.0.0.ooo87991.fpickersafe.patch
-Patch60: openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch
-Patch61: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
-Patch62: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch63: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
-Patch64: workspace.ucpgio1.patch
-Patch65: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
-Patch66: openoffice.org-3.0.0.ooo88584.sdext.extraqual.patch
+Patch12: openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch
+Patch13: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
+Patch14: openoffice.org-1.9.115.ooo69368.fixxmlsec.patch
+Patch15: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch16: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch17: openoffice.org-2.0.2.rh188467.printingdefaults.patch
+Patch18: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch19: pseudoworkspace.valgrind1.patch
+Patch20: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch21: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
+Patch22: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch23: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch24: openoffice.org-3.0.0.ooo87882.lingucomponent.systemdicts.patch
+Patch25: workspace.tl37.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.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
+Patch33: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
+Patch34: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
+Patch35: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
+Patch36: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
+Patch37: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch38: openoffice.org-2.3.0.ooo76649.httpencoding.patch
+Patch39: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
+Patch40: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
+Patch41: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
+Patch42: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
+Patch43: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
+Patch44: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
+Patch45: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
+Patch46: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
+Patch47: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
+Patch48: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
+Patch49: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+Patch50: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
+Patch51: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
+Patch52: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
+Patch53: openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
+Patch54: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
+Patch55: openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
+Patch56: openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
+Patch57: openoffice.org-3.0.0.ooo87991.fpickersafe.patch
+Patch58: openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch
+Patch59: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
+Patch60: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
+Patch61: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
+Patch62: workspace.ucpgio1.patch
+Patch63: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
+Patch64: openoffice.org-3.0.0.ooo88584.sdext.extraqual.patch
+Patch65: openoffice.org-3.0.0.ooo89172.filter.string.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/openoffice.org
@@ -1207,64 +1206,64 @@
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
+%patch10 -p1 -b .rh151357.setlangtolocale.patch
%if %{gtkprintui}
-%patch12 -p1 -b .rh127576.gtkunixprintdialog.patch
+%patch11 -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 .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 .rh217269.officecfg.nosequencecheck.patch
-%patch27 -p1 -b .tl37.patch
-%patch28 -p1 -b .ooo73201.sw.a11yloadcrash.patch
-%patch29 -p1 -b .ooo73863.vcl.imcommit.patch
-%patch30 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch31 -p0 -b .ooo68717.gstreamer.video.patch
-%patch32 -p1 -b .ooo63159.sal.dtype.patch
-%patch33 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch34 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
-%patch35 -p1 -b .ooo80816.selinux.bridges.patch
-%patch36 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
-%patch37 -p1 -b .ooo80257.sd.textonlystyle.patch
-tar xzf %{PATCH38}
-%patch39 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch40 -p1 -b .ooo76649.httpencoding.patch
-%patch41 -p1 -b .ooo83878.unopkg.enablelinking.patch
-%patch42 -p1 -b .ooo84676.ucb.davprotocol.patch
-%patch43 -p1 -b .ooo84621.sw.insertexcel.patch
-%patch44 -p1 -b .ooo85097.desktop.pagein.patch
-%patch45 -p1
-%patch46 -p1 -b .rh133741.alwaysgtk.vcl.patch
-%patch47 -p1 -b .ooo85429.sw.a11ycrash.patch
-%patch48 -p1 -b .ooo85448.emptyrpath.patch
-%patch49 -p1 -b .ooo85854.sw.graphicsaveas.patch
-%patch50 -p1 -b .ooo85921.sd.editmasterundermouse.patch
-%patch51 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch52 -p1 -b .oooXXXXX.psprint.debugcups.patch
-%patch53 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
-%patch54 -p1 -b .ooo86924.sfx2.iconchanges.patch
-%patch55 -p1 -b .ooo87204.toolkit.64bitevent.patch
-%patch56 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
-%patch57 -p1 -b .ooo87604.fixupsystemhunspell.patch
-%patch58 -p1 -b .ooo85691.vcl.tooltipcolor.patch
-%patch59 -p1 -b .ooo87991.fpickersafe.patch
-%patch60 -p1 -b .ooo88260.decl-defi-mismatch.patch
-%patch61 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
-%patch62 -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch63 -p1 -b .ooo6087.sc.sheetnames.patch
-%patch64 -p1 -b .workspace.ucpgio1.patch
-%patch65 -p1 -b .ooo89002.vcl.symbolfonts.patch
-%patch66 -p1 -b .ooo88584.sdext.extraqual.patch
+%patch12 -p1 -b .rh171692.jvmfwk.retryjvm.patch
+%patch13 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
+%patch14 -p1 -b .ooo69368.fixxmlsec.patch
+%patch15 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch16 -p1 -b .ooo58606.sw.pre-edit.patch
+%patch17 -p1
+%patch18 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch19 -p1 -b .pseudoworkspace.valgrind1.patch
+%patch20 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch21 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
+%patch22 -p1 -b .ooo65491.psprint.enablenups.patch
+cat %{PATCH23} >> svtools/source/dialogs/localize.sdf
+%patch24 -p1 -b .ooo87882.lingucomponent.systemdicts.patch
+%patch25 -p1 -b .tl37.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 .ooo76424.nonatnum.bn_IN.18npool.patch
+%patch33 -p1 -b .ooo80816.selinux.bridges.patch
+%patch34 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
+%patch35 -p1 -b .ooo80257.sd.textonlystyle.patch
+tar xzf %{PATCH36}
+%patch37 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch38 -p1 -b .ooo76649.httpencoding.patch
+%patch39 -p1 -b .ooo83878.unopkg.enablelinking.patch
+%patch40 -p1 -b .ooo84676.ucb.davprotocol.patch
+%patch41 -p1 -b .ooo84621.sw.insertexcel.patch
+%patch42 -p1 -b .ooo85097.desktop.pagein.patch
+%patch43 -p1
+%patch44 -p1 -b .rh133741.alwaysgtk.vcl.patch
+%patch45 -p1 -b .ooo85429.sw.a11ycrash.patch
+%patch46 -p1 -b .ooo85448.emptyrpath.patch
+%patch47 -p1 -b .ooo85854.sw.graphicsaveas.patch
+%patch48 -p1 -b .ooo85921.sd.editmasterundermouse.patch
+%patch49 -p1 -b .ooo86080.unopkg.bodge.patch
+%patch50 -p1 -b .oooXXXXX.psprint.debugcups.patch
+%patch51 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
+%patch52 -p1 -b .ooo86924.sfx2.iconchanges.patch
+%patch53 -p1 -b .ooo87204.toolkit.64bitevent.patch
+%patch54 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
+%patch55 -p1 -b .ooo87604.fixupsystemhunspell.patch
+%patch56 -p1 -b .ooo85691.vcl.tooltipcolor.patch
+%patch57 -p1 -b .ooo87991.fpickersafe.patch
+%patch58 -p1 -b .ooo88260.decl-defi-mismatch.patch
+%patch59 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
+%patch60 -p1 -b .ooo88341.sc.verticalboxes.patch
+%patch61 -p1 -b .ooo6087.sc.sheetnames.patch
+%patch62 -p1 -b .workspace.ucpgio1.patch
+%patch63 -p1 -b .ooo89002.vcl.symbolfonts.patch
+%patch64 -p1 -b .ooo88584.sdext.extraqual.patch
+%patch65 -p1 -b .ooo89172.filter.string.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1540,12 +1539,9 @@
#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 autosave settings
-mkdir -p $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common
-cp %{PATCH4} $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common
#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
+cp %{PATCH4} $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Paths
#add the debugging libsalalloc_malloc.so.3 library
cp -f solver/%{OFFICEUPD}/unxlng*.pro/lib/libsalalloc_malloc.so.3 $RPM_BUILD_ROOT/%{ureinstdir}/lib
@@ -1633,7 +1629,7 @@
ru help acor_ru-RU.dat western sk help acor_sk-SK.dat western \
sl help acor_sl-SI.dat western sr nohelp noacor western \
sv help acor_sv-*.dat western ta-IN nohelp noacor ctl \
-th help noacor ctl tr help acor_tr-TR.dat western \
+th help noacor ctlseqcheck tr help acor_tr-TR.dat western \
zh-CN help acor_zh-CN.dat cjk zh-TW help acor_zh-TW.dat cjk \
zu help noacor western tn help noacor western \
ts help noacor western as-IN nohelp noacor western \
@@ -1649,24 +1645,29 @@
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" %{PATCH7} > $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" %{PATCH6} >> $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" %{PATCH8} >> $lang.filelist
fi
i=$[i+1]
type=${langpackdetails[$i]}
- if [ "$type" = "ctl" ]; then
- sed -e "s/LANG/$lang/g" %{PATCH10} >> $lang.filelist
- fi
if [ "$type" = "cjk" ]; then
- sed -e "s/LANG/$lang/g" %{PATCH6} >> $lang.filelist
+ sed -e "s/LANG/$lang/g" %{PATCH5} >> $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" %{PATCH9} >> $lang.filelist
+ fi
+ if [ "$type" = "ctl" ]; then
+ rm $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_$lang.xcu
fi
i=$[i+1]
done
@@ -2357,7 +2358,6 @@
%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office
%{basisinstdir}/share/registry/modules/org/openoffice/Office/Embedding
%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Common
-%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/AutoSaveCommon.xcu
%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-unx.xcu
%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Linguistic
%{basisinstdir}/share/registry/modules/org/openoffice/Office/Linguistic/Linguistic-lingucomponent-hyphenator.xcu
@@ -3383,7 +3383,7 @@
%{python_py_sitearch}/unohelper.py*
%changelog
-* Tue May 06 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.11.1
+* 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
@@ -3391,9 +3391,11 @@
- 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
* Wed Apr 30 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.10.1
- next version
--- AutoSaveCommon.xcu DELETED ---
--- openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch DELETED ---
More information about the fedora-extras-commits
mailing list