rpms/openoffice.org/devel openoffice.org.spec,1.975,1.976

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8537

Modified Files:
	openoffice.org.spec 
Log Message:
require hunspell-en and drop the english dicts


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.975
retrieving revision 1.976
diff -u -r1.975 -r1.976
--- openoffice.org.spec	12 Dec 2006 16:21:52 -0000	1.975
+++ openoffice.org.spec	13 Dec 2006 16:08:53 -0000	1.976
@@ -1,6 +1,6 @@
 %define oootag OOE680
 %define ooomilestone 6
-%define rh_rpm_release 6
+%define rh_rpm_release 7
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -166,6 +166,7 @@
 Group: Applications/Productivity
 Requires: urw-fonts
 Requires: dejavu-lgc-fonts
+Requires: hunspell-en
 %ifarch %{ppc}
 # Ensure we have 32-bit theme libs in 64-bit multilib environments.
 # We need at least 32-bit redhat-artwork and 32-bit gtk2-engines, but
@@ -1226,7 +1227,8 @@
 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/
-mv $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/en_??.??? $RPM_BUILD_ROOT/%{_datadir}/myspell/
+#remove any english dictionaries, they are in hunspell-en
+rm -rf $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/en_??.???
 i=0
 while [ $i -lt ${#langpackdetails[@]} ]; do
    i=$[i+2]
@@ -1239,32 +1241,6 @@
 pushd $RPM_BUILD_ROOT/%{_datadir}/myspell/
 ln -s af_ZA.aff af_NA.aff
 ln -s af_ZA.dic af_NA.dic
-ln -s en_GB.aff en_AU.aff
-ln -s en_GB.dic en_AU.dic
-ln -s en_GB.aff en_BS.aff
-ln -s en_GB.dic en_BS.dic
-ln -s en_GB.aff en_BZ.aff
-ln -s en_GB.dic en_BZ.dic
-ln -s en_GB.aff en_CA.aff
-ln -s en_GB.dic en_CA.dic
-ln -s en_GB.aff en_IE.aff
-ln -s en_GB.dic en_IE.dic
-ln -s en_GB.aff en_IN.aff
-ln -s en_GB.dic en_IN.dic
-ln -s en_GB.aff en_JM.aff
-ln -s en_GB.dic en_JM.dic
-ln -s en_GB.aff en_NA.aff
-ln -s en_GB.dic en_NA.dic
-ln -s en_GB.aff en_NZ.aff
-ln -s en_GB.dic en_NZ.dic
-ln -s en_GB.aff en_ZA.aff
-ln -s en_GB.dic en_ZA.dic
-ln -s en_GB.aff en_ZW.aff
-ln -s en_GB.dic en_ZW.dic
-ln -s en_GB.aff en_TT.aff
-ln -s en_GB.dic en_TT.dic
-ln -s en_US.aff en_PH.aff
-ln -s en_US.dic en_PH.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
@@ -1957,7 +1933,6 @@
 %{instdir}/share/dict/ooo/dictionary.lst
 %{instdir}/share/dict/ooo/WordNet_license.txt
 %{instdir}/share/dict/ooo/*en_*
-%{_datadir}/myspell/*en_*
 %else
 %{_datadir}/myspell/*
 %{instdir}/share/dict/ooo/*
@@ -2626,6 +2601,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Wed Dec 13 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.1.0-6.7
+- split out english dictionaries into hunspell-en
+
 * Tue Dec 12 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.1.0-6.6
 - Resolves: rhbz#219161 openoffice.org-2.1.0.ooo72505.vcl.wrongrole.patch