rpms/openoffice.org/devel openoffice.org.spec, 1.1041, 1.1042 sources, 1.225, 1.226 openoffice.org-1.9.84.rhXXXXXX.lingucomponent.contribdict.patch, 1.3, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Feb 14 19:27:29 UTC 2007
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5744
Modified Files:
openoffice.org.spec sources
Removed Files:
openoffice.org-1.9.84.rhXXXXXX.lingucomponent.contribdict.patch
Log Message:
lets go, hey ho
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1041
retrieving revision 1.1042
diff -u -r1.1041 -r1.1042
--- openoffice.org.spec 14 Feb 2007 12:20:36 -0000 1.1041
+++ openoffice.org.spec 14 Feb 2007 19:27:27 -0000 1.1042
@@ -33,14 +33,13 @@
Group: Applications/Productivity
URL: http://www.openoffice.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source: %{ooo_base_name}.tar.bz2
-Source1: openoffice.org-myspell-contrib.tar.gz
-Source2: http://svn.gnome.org/viewcvs/*checkout*/ooo-build/trunk/src/evolocal.odb
-Source3: http://people.redhat.com/caolanm/templates/Tigert-templates.tar.gz
-Source4: documentation.openoffice.org-templates.tar.gz
-Source5: http://people.redhat.com/caolanm/templates/redhat-templates.tar.gz
-Source6: http://www.openoffice.org/nonav/issues/showattachment.cgi/36775/ooo64726.sdf
-Source7: openoffice.org.langpack.template.tar.gz
+Source0: %{ooo_base_name}.tar.bz2
+Source1: http://svn.gnome.org/viewcvs/*checkout*/ooo-build/trunk/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://www.openoffice.org/nonav/issues/showattachment.cgi/36775/ooo64726.sdf
+Source6: openoffice.org.langpack.template.tar.gz
BuildRequires: tcsh, zip, findutils, prelink autoconf, flex, bison, ant, icu
BuildRequires: perl-Compress-Zlib binutils, gcc-java, unixODBC-devel, xalan-j2
BuildRequires: libgcj-devel, java-1.4.2-gcj-compat-devel, zlib-devel, xerces-j2
@@ -68,56 +67,53 @@
Patch11: openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
Patch12: openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
Patch13: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
-%if %{langpacks}
-Patch14: openoffice.org-1.9.84.rhXXXXXX.lingucomponent.contribdict.patch
-%endif
-Patch15: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
-Patch16: openoffice.org-1.9.129.ooo54603.fontconfig.patch
-Patch17: openoffice.org-1.9.115.ooo51931.fixxmlsec.patch
-Patch18: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
-Patch19: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch20: workspace.libxslt02.patch
-Patch21: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch22: openoffice.org-2.0.2.rh188467.printingdefaults.patch
-Patch23: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch24: workspace.fpicker6.patch
-Patch25: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
-Patch26: openoffice.org-2.0.2.ooo59127.vcl.honourcairofont.patch
-Patch27: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
-Patch28: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
-Patch29: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
-Patch30: ooobuild.VBAObjects.patch
-Patch31: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch32: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
-Patch33: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
-Patch34: pseudoworkspace.valgrind1.patch
-Patch35: workspace.thbpp6.patch
-Patch36: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch37: openoffice.org-2.0.4.rh217065.syncbackspace.patch
-Patch38: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
-Patch39: openoffice.org.2.0.4.oooXXXXX.i18npool.extendgrapheme.patch
-Patch40: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
-Patch41: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
-Patch42: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
-Patch43: openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch
-Patch44: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch
-Patch45: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
-Patch46: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
-Patch47: openoffice.org-2.1.0.gccXXXXX.basegfx.crash.patch
-Patch48: workspace.tl37.patch
-Patch49: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
-Patch50: openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch
-Patch51: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
-Patch52: openoffice.org-2.1.0.oooXXXXX.vcl.makenotdefglyph.patch
-Patch53: openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch
-Patch54: workspace.cmcfixes32.patch
-Patch55: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
-Patch56: openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch
-Patch57: openoffice.org-2.2.0.oooXXXXX.atkthreads.atexit.patch
-Patch58: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch59: openoffice.org-2.2.0.ooo74255.vcl.depth.mismatch.patch
-Patch60: openoffice.org-2.2.0.ooo74451.sw.typemismatch.patch
-Patch61: openoffice.org-2.2.0.ooo74401.basctl.boost.patch
+Patch14: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
+Patch15: openoffice.org-1.9.129.ooo54603.fontconfig.patch
+Patch16: openoffice.org-1.9.115.ooo51931.fixxmlsec.patch
+Patch17: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
+Patch18: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch19: workspace.libxslt02.patch
+Patch20: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch21: openoffice.org-2.0.2.rh188467.printingdefaults.patch
+Patch22: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch23: workspace.fpicker6.patch
+Patch24: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
+Patch25: openoffice.org-2.0.2.ooo59127.vcl.honourcairofont.patch
+Patch26: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
+Patch27: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
+Patch28: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
+Patch29: ooobuild.VBAObjects.patch
+Patch30: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch31: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
+Patch32: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
+Patch33: pseudoworkspace.valgrind1.patch
+Patch34: workspace.thbpp6.patch
+Patch35: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch36: openoffice.org-2.0.4.rh217065.syncbackspace.patch
+Patch37: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
+Patch38: openoffice.org.2.0.4.oooXXXXX.i18npool.extendgrapheme.patch
+Patch39: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch40: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
+Patch41: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch42: openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch
+Patch43: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch
+Patch44: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
+Patch45: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
+Patch46: openoffice.org-2.1.0.gccXXXXX.basegfx.crash.patch
+Patch47: workspace.tl37.patch
+Patch48: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
+Patch49: openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch
+Patch50: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
+Patch51: openoffice.org-2.1.0.oooXXXXX.vcl.makenotdefglyph.patch
+Patch52: openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch
+Patch53: workspace.cmcfixes32.patch
+Patch54: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
+Patch55: openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch
+Patch56: openoffice.org-2.2.0.oooXXXXX.atkthreads.atexit.patch
+Patch57: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch58: openoffice.org-2.2.0.ooo74255.vcl.depth.mismatch.patch
+Patch59: openoffice.org-2.2.0.ooo74451.sw.typemismatch.patch
+Patch60: openoffice.org-2.2.0.ooo74401.basctl.boost.patch
%define instdir %{_libdir}/openoffice.org
@@ -953,62 +949,55 @@
%patch11 -p1 -b .rh156677.cripplemenus.sysui.patch
%patch12 -p1 -b .rh171692.jvmfwk.defaulttogcj.patch
%patch13 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
-%if %{langpacks}
-%patch14 -p1 -b .rhXXXXXX.lingucomponent.contribdict.patch
-%endif
-%patch15 -p1 -b .ooo48256.nolongname.sysui.patch
-%patch16 -p1 -b .ooo54603.fontconfig.patch
-%patch17 -p1 -b .ooo51931.fixxmlsec.patch
-%patch18 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
-%patch19 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch20 -p1 -b .workspace.libxslt02.patch
-%patch21 -p1 -b .ooo58606.sw.pre-edit.patch
-%patch22 -p1
-%patch23 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch24 -p1 -b .workspace.fpicker6.patch
-%patch25 -p1 -b .oooXXXXX.selinux.bridges.patch
-%patch26 -p1 -b .ooo59127.vcl.honourcairofont.patch
-%patch27 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
-%patch28 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
-%patch29 -p1 -b .rh187919.gtkunderkde.patch
-%patch30 -p0 -b .ooobuild.VBAObjects.patch
-%patch31 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch32 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
-%patch33 -p1 -b .ooo69051.vcl.singlekeypress.patch
-%patch34 -p1 -b .pseudoworkspace.valgrind1.patch
-%patch35 -p1 -b .workspace.thbpp6.patch
-%patch36 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch37 -p1 -b .rh217065.syncbackspace.patch
-%patch38 -p1 -b .ooo70155.fasterhelplinking.patch
-%patch39 -p1 -b .oooXXXXX.i18npool.extendgrapheme.patch
-%patch40 -p1 -b .ooo65491.psprint.enablenups.patch
-%patch41 -p1 -b .ooo61812.svx.a11ycrash.patch
-cat %{PATCH42} >> svtools/source/dialogs/localize.sdf
-%patch43 -p1 -b .ooo72014.officecfg.malayammenu.patch
-%patch44 -p1 -b .oooXXXXX.lingucomponent.systemhunspell.patch
-%patch45 -p1 -b .rh217269.officecfg.nosequencecheck.patch
-%patch46 -p1 -b .ooo72129.vcl.fontglyphindex.patch
-%patch47 -p1 -b .gccXXXXX.basegfx.crash.patch
-%patch48 -p1 -b .tl37.patch
-%patch49 -p1 -b .ooo73201.sw.a11yloadcrash.patch
-%patch50 -p1 -b .ooo73481.svx.longnotint32.patch
-%patch51 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
-%patch52 -p1 -b .oooXXXXX.vcl.makenotdefglyph.patch
-%patch53 -p1 -b .ooo73866.javaunohelper.parallel.patch
-%patch54 -p1 -b .workspace.cmcfixes32.patch
-%patch55 -p1 -b .ooo73863.vcl.imcommit.patch
-%patch56 -p1 -b .ooo73974.bridges.doublereturn.patch
-%patch57 -p1 -b .oooXXXXX.atkthreads.atexit.patch
-%patch58 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch59 -p1 -b .ooo74255.vcl.depth.mismatch.patch
-%patch60 -p1 -b .ooo74451.sw.typemismatch.patch
-%patch61 -p1 -b .ooo74401.basctl.boost.patch
-
-%if %{langpacks}
-tar xzf %{SOURCE1}
-%endif
+%patch14 -p1 -b .ooo48256.nolongname.sysui.patch
+%patch15 -p1 -b .ooo54603.fontconfig.patch
+%patch16 -p1 -b .ooo51931.fixxmlsec.patch
+%patch17 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
+%patch18 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch19 -p1 -b .workspace.libxslt02.patch
+%patch20 -p1 -b .ooo58606.sw.pre-edit.patch
+%patch21 -p1
+%patch22 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch23 -p1 -b .workspace.fpicker6.patch
+%patch24 -p1 -b .oooXXXXX.selinux.bridges.patch
+%patch25 -p1 -b .ooo59127.vcl.honourcairofont.patch
+%patch26 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
+%patch27 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
+%patch28 -p1 -b .rh187919.gtkunderkde.patch
+%patch29 -p0 -b .ooobuild.VBAObjects.patch
+%patch30 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch31 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
+%patch32 -p1 -b .ooo69051.vcl.singlekeypress.patch
+%patch33 -p1 -b .pseudoworkspace.valgrind1.patch
+%patch34 -p1 -b .workspace.thbpp6.patch
+%patch35 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch36 -p1 -b .rh217065.syncbackspace.patch
+%patch37 -p1 -b .ooo70155.fasterhelplinking.patch
+%patch38 -p1 -b .oooXXXXX.i18npool.extendgrapheme.patch
+%patch39 -p1 -b .ooo65491.psprint.enablenups.patch
+%patch40 -p1 -b .ooo61812.svx.a11ycrash.patch
+cat %{PATCH41} >> svtools/source/dialogs/localize.sdf
+%patch42 -p1 -b .ooo72014.officecfg.malayammenu.patch
+%patch43 -p1 -b .oooXXXXX.lingucomponent.systemhunspell.patch
+%patch44 -p1 -b .rh217269.officecfg.nosequencecheck.patch
+%patch45 -p1 -b .ooo72129.vcl.fontglyphindex.patch
+%patch46 -p1 -b .gccXXXXX.basegfx.crash.patch
+%patch47 -p1 -b .tl37.patch
+%patch48 -p1 -b .ooo73201.sw.a11yloadcrash.patch
+%patch49 -p1 -b .ooo73481.svx.longnotint32.patch
+%patch50 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
+%patch51 -p1 -b .oooXXXXX.vcl.makenotdefglyph.patch
+%patch52 -p1 -b .ooo73866.javaunohelper.parallel.patch
+%patch53 -p1 -b .workspace.cmcfixes32.patch
+%patch54 -p1 -b .ooo73863.vcl.imcommit.patch
+%patch55 -p1 -b .ooo73974.bridges.doublereturn.patch
+%patch56 -p1 -b .oooXXXXX.atkthreads.atexit.patch
+%patch57 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
+%patch58 -p1 -b .ooo74255.vcl.depth.mismatch.patch
+%patch59 -p1 -b .ooo74451.sw.typemismatch.patch
+%patch60 -p1 -b .ooo74401.basctl.boost.patch
-cp %{SOURCE2} extras/source/database/evolocal.odb
+cp %{SOURCE1} extras/source/database/evolocal.odb
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1050,7 +1039,7 @@
cd transex3/prj
build --dlv_switch -link --all $SMP_MFLAGS -- $SMP_MFLAGS -s
deliver -link
-localize -m -x -l bn -f %{SOURCE6}
+localize -m -x -l bn -f %{SOURCE5}
cd ../..
cd instsetoo_native/util
@@ -1154,38 +1143,38 @@
#langpack id, has help or not, dictionary pattern, other linguistic pattern, script classification
langpackdetails=\
(\
-af help af_??.??? *af_ZA* western ar nohelp nodict nolingu ctl \
-bg help bg_BG.??? *bg_BG* western bn help nodict nolingu western \
-ca help ca_ES.??? *ca_ES* western cs help nodict *cs_CZ* western \
-cy nohelp cy_GB.??? *cy_GB* western da help da_DK.??? *da_DK* western \
-de help de_??.??? *de_* western el help el_GR.??? *el_GR* western \
-es help es_??.??? *es_* western et help et_EE.??? *et_EE* western \
-eu nohelp nodict nolingu western fi nohelp nodict *fi_FI* western \
-fr help fr_??.??? *fr_* western ga nohelp ga_IE.??? *ga_IE* western \
-gl help gl_ES.??? *gl_ES* western gu-IN nohelp nodict nolingu ctl \
-pa-IN help nodict nolingu ctl he nohelp he_IL.??? *he_IL* ctl \
-hi-IN help nodict nolingu ctl hu help hu_HU.??? *hu_HU* western \
-hr nohelp hr_HR.??? *hr_HR* western it help it_??.??? *it_IT* western \
-ja help nodict nolingu cjk ko help nodict nolingu cjk \
-lt nohelp lt_LT.??? *lt_LT* western ms nohelp ms_??.??? *ms_MY* western \
-nb help nb_NO.??? *nb_NO* western nl help nl_??.??? *nl_* western \
-nn help nn_NO.??? *nn_NO* western pl help pl_PL.??? *pl_PL* western \
-pt help pt_PT.??? *pt_PT* western pt-BR help pt_BR.??? *pt_BR* western \
-ru help ru_RU.??? *ru_RU* western sk help sk_SK.??? *sk_SK* western \
-sl help sl_SI.??? *sl_SI* western sr-CS nohelp nodict nolingu western \
-sv help sv_??.??? *sv_* western ta-IN nohelp nodict nolingu ctl \
-th help th_TH.??? *th_TH* ctl tr help nodict nolingu western \
-zh-CN help nodict nolingu cjk zh-TW help nodict nolingu cjk \
-zu help zu_ZA.??? *zu_ZA* western tn help nodict nolingu western \
-ts help nodict nolingu western as-IN nohelp nodict nolingu western \
-mr-IN nohelp nodict nolingu western ml-IN nohelp nodict nolingu western \
-or-IN nohelp nodict nolingu western te-IN nohelp nodict nolingu western \
-ur-IN nohelp nodict nolingu western kn-IN nohelp nodict nolingu western \
-xh help nodict nolingu western ve nohelp nodict nolingu western \
-st help nodict nolingu western ss nohelp nodict nolingu western \
-nr help nodict nolingu western ns help nodict nolingu western \
+af help nolingu western ar nohelp nolingu ctl \
+bg help nolingu western bn help nolingu western \
+ca help nolingu western cs help *cs_CZ* western \
+cy nohelp nolingu western da help *hyph_da_DK* western \
+de help *_de_* western el help nolingu western \
+es help nolingu western et help *hyph_et_EE* western \
+eu nohelp nolingu western fi nohelp nolingu western \
+fr help nolingu western ga nohelp nolingu western \
+gl help nolingu western gu-IN nohelp nolingu ctl \
+pa-IN help nolingu ctl he nohelp nolingu ctl \
+hi-IN help nolingu ctl hu help *hyph_hu_HU* western \
+hr nohelp nolingu western it help *hyph_it_IT* western \
+ja help nolingu cjk ko help nolingu cjk \
+lt nohelp nolingu western ms nohelp nolingu western \
+nb help nolingu western nl help *hyph_nl_NL* western \
+nn help nolingu western pl help *pl_PL* western \
+pt help nolingu western pt-BR help nolingu western \
+ru help nolingu western sk help *sk_SK* western \
+sl help nolingu western sr-CS nohelp nolingu western \
+sv help nolingu western ta-IN nohelp nolingu ctl \
+th help nolingu ctl tr help nolingu western \
+zh-CN help nolingu cjk zh-TW help nolingu cjk \
+zu help nolingu western tn help nolingu western \
+ts help nolingu western as-IN nohelp nolingu western \
+mr-IN nohelp nolingu western ml-IN nohelp nolingu western \
+or-IN nohelp nolingu western te-IN nohelp nolingu western \
+ur-IN nohelp nolingu western kn-IN nohelp nolingu western \
+xh help nolingu western ve nohelp nolingu western \
+st help nolingu western ss nohelp nolingu western \
+nr help nolingu western ns help nolingu western \
)
-tar xzf %{SOURCE7}
+tar xzf %{SOURCE6}
i=0
while [ $i -lt ${#langpackdetails[@]} ]; do
lang=${langpackdetails[$i]}
@@ -1196,11 +1185,6 @@
sed -e "s/LANG/$lang/g" openoffice.org.langpack-help.template >> $lang.filelist
fi
i=$[i+1]
- dict=${langpackdetails[$i]}
- if [ ! "$dict" = "nodict" ]; then
- sed -e "s/DICTPATTERN/$dict/g" openoffice.org.langpack-dict.template >> $lang.filelist
- fi
- i=$[i+1]
lingu=${langpackdetails[$i]}
if [ ! "$lingu" = "nolingu" ]; then
sed -e "s/LINGUPATTERN/$lingu/g" openoffice.org.langpack-lingu.template >> $lang.filelist
@@ -1220,85 +1204,13 @@
#this src.rpm totally, we'll make links at this time as well
grep -v DICT $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/dictionary.lst > $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/dictionary.lst.tmp
mv -f $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/dictionary.lst.tmp $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/dictionary.lst
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell/
-#remove any english dictionaries, they are in hunspell-en
-rm -rf $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/en_??.??? $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/README_en_GB.txt
-i=0
-while [ $i -lt ${#langpackdetails[@]} ]; do
- i=$[i+2]
- dict=${langpackdetails[$i]}
- if [ ! "$dict" = "nodict" ]; then
- mv $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/$dict $RPM_BUILD_ROOT/%{_datadir}/myspell/
- fi
- i=$[i+3]
-done
-pushd $RPM_BUILD_ROOT/%{_datadir}/myspell/
-ln -s af_ZA.aff af_NA.aff
-ln -s af_ZA.dic af_NA.dic
-ln -s de_CH.aff de_LI.aff
-ln -s de_CH.dic de_LI.dic
-ln -s de_DE.aff de_BE.aff
-ln -s de_DE.dic de_BE.dic
-ln -s de_DE.aff de_LU.aff
-ln -s de_DE.dic de_LU.dic
-ln -s es_MX.aff es_AR.aff
-ln -s es_MX.dic es_AR.dic
-ln -s es_MX.aff es_BO.aff
-ln -s es_MX.dic es_BO.dic
-ln -s es_MX.aff es_CL.aff
-ln -s es_MX.dic es_CL.dic
-ln -s es_MX.aff es_CO.aff
-ln -s es_MX.dic es_CO.dic
-ln -s es_MX.aff es_CR.aff
-ln -s es_MX.dic es_CR.dic
-ln -s es_MX.aff es_DO.aff
-ln -s es_MX.dic es_DO.dic
-ln -s es_MX.aff es_EC.aff
-ln -s es_MX.dic es_EC.dic
-ln -s es_MX.aff es_GT.aff
-ln -s es_MX.dic es_GT.dic
-ln -s es_MX.aff es_HN.aff
-ln -s es_MX.dic es_HN.dic
-ln -s es_MX.aff es_NI.aff
-ln -s es_MX.dic es_NI.dic
-ln -s es_MX.aff es_PA.aff
-ln -s es_MX.dic es_PA.dic
-ln -s es_MX.aff es_PE.aff
-ln -s es_MX.dic es_PE.dic
-ln -s es_MX.aff es_PR.aff
-ln -s es_MX.dic es_PR.dic
-ln -s es_MX.aff es_PY.aff
-ln -s es_MX.dic es_PY.dic
-ln -s es_MX.aff es_SV.aff
-ln -s es_MX.dic es_SV.dic
-ln -s es_MX.aff es_UY.aff
-ln -s es_MX.dic es_UY.dic
-ln -s es_MX.aff es_VE.aff
-ln -s es_MX.dic es_VE.dic
-ln -s fr_FR.aff fr_BE.aff
-ln -s fr_FR.dic fr_BE.dic
-ln -s fr_FR.aff fr_CA.aff
-ln -s fr_FR.dic fr_CA.dic
-ln -s fr_FR.aff fr_CH.aff
-ln -s fr_FR.dic fr_CH.dic
-ln -s fr_FR.aff fr_LU.aff
-ln -s fr_FR.dic fr_LU.dic
-ln -s fr_FR.aff fr_MC.aff
-ln -s fr_FR.dic fr_MC.dic
-ln -s it_IT.aff it_CH.aff
-ln -s it_IT.dic it_CH.dic
-ln -s ms_MY.aff ms_BN.aff
-ln -s ms_MY.dic ms_BN.dic
-ln -s nl_NL.aff nl_BE.aff
-ln -s nl_NL.dic nl_BE.dic
-ln -s sv_SE.aff sv_FI.aff
-ln -s sv_SE.dic sv_FI.dic
-popd
+#remove the dictionaries, they are in hunspell-??
+rm -rf $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/??_??.dic $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/README_??_??.txt
#add in some templates
+tar xzf %{SOURCE2} -C $RPM_BUILD_ROOT/%{instdir}/share
tar xzf %{SOURCE3} -C $RPM_BUILD_ROOT/%{instdir}/share
tar xzf %{SOURCE4} -C $RPM_BUILD_ROOT/%{instdir}/share
-tar xzf %{SOURCE5} -C $RPM_BUILD_ROOT/%{instdir}/share
#skip the swahelli for now
rm -rf $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/*sw_TZ*
@@ -1945,7 +1857,6 @@
%{instdir}/share/dict/ooo/dictionary.lst
%{instdir}/share/dict/ooo/*hyph_en*
%else
-%{_datadir}/myspell/*
%{instdir}/share/dict/ooo/*
%endif
%dir %{instdir}/share/dtd
@@ -2628,6 +2539,7 @@
%changelog
* Wed Feb 14 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-7.2
- Resolves: rhbz#228629 mistranslation for properties in or-IN
+- drop dictionaries, they're in hunspell-?? now
* Tue Feb 13 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-7.1
- Resolves: rhbz#228254 crash on print to pdf after print to ps
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- sources 12 Feb 2007 10:38:48 -0000 1.225
+++ sources 14 Feb 2007 19:27:27 -0000 1.226
@@ -3,6 +3,5 @@
1b4d9a03ebb4c864015620153afb77c6 Tigert-templates.tar.gz
05a906513ef89af5e189097fa0c50681 ooo64726.sdf
26c72b57608d21c7cccf941f1df2aea9 redhat-templates.tar.gz
-b32a3c75ca5d6fe7249cd63dc358c421 openoffice.org.langpack.template.tar.gz
-ecd3e4a6677056f340ddb209c442cb4d openoffice.org-myspell-contrib.tar.gz
ecb01cc1d6a1bb9d6072fa1452893f53 OOF680_m7.tar.bz2
+5f3e9e21dc5860fc7530cffcfd3c6907 openoffice.org.langpack.template.tar.gz
--- openoffice.org-1.9.84.rhXXXXXX.lingucomponent.contribdict.patch DELETED ---
More information about the fedora-cvs-commits
mailing list