rpms/openoffice.org/devel openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch, 1.4, 1.5 openoffice.org.spec, 1.1349, 1.1350 openoffice.org.langpack-lingu.template, 1.1, NONE

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Fri Nov 30 08:53:06 UTC 2007


Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31383

Modified Files:
	openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch 
	openoffice.org.spec 
Removed Files:
	openoffice.org.langpack-lingu.template 
Log Message:
goodbye thesauri

openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch:

Index: openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch	26 Nov 2007 22:54:19 -0000	1.4
+++ openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch	30 Nov 2007 08:53:00 -0000	1.5
@@ -11,14 +11,15 @@
  	//	  when the permissions for the share tree are missing. E.g. in user installations.)
 -	const USHORT nDirectories = 3;
 -    String aDirectories[ 3 /*nDirectories*/ ];
-+	const USHORT nDirectories = 5;
-+    String aDirectories[ 5 /*nDirectories*/ ];
++	const USHORT nDirectories = 6;
++    String aDirectories[ 6 /*nDirectories*/ ];
      aDirectories[0] = linguistic::GetFileURL( SvtPathOptions::PATH_LINGUISTIC, String::CreateFromAscii( "x" ) );
      aDirectories[1] = linguistic::GetFileURL( SvtPathOptions::PATH_LINGUISTIC, String::CreateFromAscii( "ooo" ) );
      //!! warning: see bUseFile below when changing this index !!
  	aDirectories[2] = linguistic::GetFileURL( SvtPathOptions::PATH_USERDICTIONARY, String::CreateFromAscii( "x" ) );
 +    aDirectories[3] = String::CreateFromAscii( "file:///usr/share/myspell" );
 +    aDirectories[4] = String::CreateFromAscii( "file:///usr/share/hyphen" );
++    aDirectories[5] = String::CreateFromAscii( "file:///usr/share/mythes" );
  	//
      aDirectories[0].Erase( aDirectories[0].Len() - 2, 2 );	// erase /x from URL
      aDirectories[2].Erase( aDirectories[2].Len() - 2, 2 );	// erase /x from URL
@@ -262,3 +263,100 @@
          [ AC_MSG_ERROR(altlinuxhyph library not found or too old.)], [])
  else
      AC_MSG_RESULT([internal])
+Index: source/thesaurus/libnth/nthesimp.cxx
+===================================================================
+RCS file: /cvs/whiteboard/lingucomponent/source/thesaurus/libnth/nthesimp.cxx,v
+retrieving revision 1.10
+diff -u -r1.10 nthesimp.cxx
+--- openoffice.org.orig/lingucomponent/source/thesaurus/libnth/nthesimp.cxx	18 Jul 2007 09:41:49 -0000	1.10
++++ openoffice.org/lingucomponent/source/thesaurus/libnth/nthesimp.cxx	28 Nov 2007 15:57:52 -0000
+@@ -172,9 +172,11 @@
+         dictentry * upthes;  // shared thesaurus list entry pointer
+ 	std::vector<dictentry*> postspthes;
+ 	std::vector<dictentry*> postupthes;
++	std::vector<dictentry*> postsyspthes;
+         SvtPathOptions aPathOpt;
+         int numusr;          // number of user dictionary entries
+         int numshr = 0;          // number of shared dictionary entries
++        int numsys;          // number of system dictionary entries
+ 
+ 	if (!numthes) {
+ 
+@@ -221,15 +223,43 @@
+ 		postspthes.push_back(&spthes[i]);
+             }
+ 
++            numsys = 0;
++            const OUString sSystemDictPath(A2OU("file:///usr/share/mythes"));
++            osl::Directory aSystemDicts(sSystemDictPath);
++            if (aSystemDicts.open() == osl::FileBase::E_None)
++            {
++                DirectoryItem aItem;
++                FileStatus aFileStatus(FileStatusMask_FileURL);
++                while (aSystemDicts.getNextItem(aItem) == osl::FileBase::E_None)
++                {
++                    aItem.getFileStatus(aFileStatus);
++                    rtl::OUString sPath = aFileStatus.getFileURL();
++                    if (sPath.lastIndexOf(A2OU("_v2.idx")) == sPath.getLength()-7)
++                    {
++                        sal_Int32 nStartIndex = sPath.lastIndexOf(sal_Unicode('/')) + 1;
++                        sal_Int32 nIndex = nStartIndex;
++                        nIndex += strlen("th_");
++                        OUString sLang = sPath.getToken( 0, '_', nIndex );
++                        OUString sRegion = sPath.getToken( 0, '_', nIndex );
++                        sPath = sPath.copy(nStartIndex, nIndex - nStartIndex - 1 + 3);
++                        dictentry *entry = new dictentry;
++                        entry->filename = strdup(OUStringToOString(sPath, RTL_TEXTENCODING_UTF8).getStr());
++                        entry->lang = strdup(OUStringToOString(sLang, RTL_TEXTENCODING_UTF8).getStr());
++                        entry->region = strdup(OUStringToOString(sRegion, RTL_TEXTENCODING_UTF8).getStr());
++                        postsyspthes.push_back(entry);
++                    }
++                }
++            }
++
+ 	    numusr = postupthes.size();
+             numshr = postspthes.size();
+-
++            numsys = postsyspthes.size();
+ 	    
+             // we really should merge these and remove duplicates but since 
+             // users can name their dictionaries anything they want it would
+             // be impossible to know if a real duplication exists unless we
+             // add some unique key to each dictionary
+-            numthes = numshr + numusr;
++            numthes = numsys + numshr + numusr;
+ 
+             if (numthes) {
+ 	        aThes = new MyThes* [numthes];
+@@ -283,6 +313,31 @@
+                     k++;
+                 }
+ 
++                // now add the system thesauri
++                for (i = 0; i < numsys; i++) {
++                    Locale nLoc( A2OU(postsyspthes[i]->lang), A2OU(postsyspthes[i]->region), OUString() );
++                    newloc = 1;
++                    for (j = 0; j < numlocs; j++) {
++                        if (nLoc == pLocale[j]) newloc = 0;
++                    }
++                    if (newloc) {
++                        pLocale[numlocs] = nLoc;
++                        numlocs++;
++                    }
++                    aTLocs[k] = nLoc;
++                    aThes[k] = NULL;
++                    aTEncs[k] = 0;
++                    aTNames[k] = sSystemDictPath + A2OU("/") + A2OU(postsyspthes[i]->filename);
++                    aCharSetInfo[k] = new CharClass(nLoc);
++  
++                    free(postsyspthes[i]->filename);
++                    free(postsyspthes[i]->lang);
++                    free(postsyspthes[i]->region);
++                    delete postsyspthes[i];
++  
++                    k++;
++                }
++
+                 aSuppLocales.realloc(numlocs);
+ 
+             } else {


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1349
retrieving revision 1.1350
diff -u -r1.1349 -r1.1350
--- openoffice.org.spec	27 Nov 2007 19:46:42 -0000	1.1349
+++ openoffice.org.spec	30 Nov 2007 08:53:00 -0000	1.1350
@@ -1,6 +1,6 @@
 %define oootag OOG680
 %define ooomilestone 9
-%define rh_rpm_release 4
+%define rh_rpm_release 5
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -47,6 +47,8 @@
 %define langpack_langs en-US
 %endif
 
+%define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
+
 %define ooo_base_name %{oootag}_m%{ooomilestone}
 
 Summary:        OpenOffice.org comprehensive office suite.
@@ -86,7 +88,7 @@
 Patch5:  openoffice.org.langpack-cjk.template
 Patch6:  openoffice.org.langpack-help.template
 Patch7:  openoffice.org.langpack-common.template
-Patch8:  openoffice.org.langpack-lingu.template
+Patch8:  openoffice.org.langpack-acor.template
 Patch9:  openoffice.org.langpack-ctl.template
 Patch10: openoffice.org-1.9.88.rh133741.alwaysgtk.desktop.patch
 Patch11: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
@@ -407,7 +409,7 @@
 Summary: Czech language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-cs, hyphen-cs
+Requires: hunspell-cs, hyphen-cs, mythes-cs
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org-langpack-cs
 Obsoletes: openoffice.org2-langpack-cs_CZ
@@ -445,7 +447,7 @@
 Summary: German language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-de, hyphen-de
+Requires: hunspell-de, hyphen-de, mythes-de
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-de
 
@@ -470,6 +472,7 @@
 Summary: English language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: mythes-en
 
 %description langpack-en
 English thesaurus for %{name}.
@@ -729,7 +732,7 @@
 Summary: Polish language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-pl, hyphen-pl
+Requires: hunspell-pl, hyphen-pl, mythes-pl
 Obsoletes: openoffice.org-langpack-pl
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-pl_PL
@@ -776,7 +779,7 @@
 Summary: Slovak language pack for %{name}
 Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-sk
+Requires: hunspell-sk, mythes-sk
 Obsoletes: openoffice.org-langpack-sk
 Obsoletes: openoffice.org-i18n
 Obsoletes: openoffice.org2-langpack-sk_SK
@@ -1127,7 +1130,7 @@
 cd config_office
 autoconf
 export PATH=$PATH:/usr/sbin
-%configure --with-build-version=%{name}-%{version}-%{release} --with-unix-wrapper=%{name} --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-ant-home=/usr/share/ant %{jdkflags} --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --enable-dbus --with-system-libs --with-system-python --with-system-mozilla=xulrunner --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt  --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --with-system-altlinuxhyph --with-system-libtextcat --with-system-vigra --without-system-mspack --without-system-xt --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms %{stlflags} --!
 with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS"
+%configure --with-build-version=%{name}-%{version}-%{release} --with-unix-wrapper=%{name} --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-ant-home=/usr/share/ant %{jdkflags} --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --enable-dbus --with-system-libs --with-system-python --with-system-mozilla=xulrunner --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt  --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --with-system-altlinuxhyph --with-system-libtextcat --with-system-vigra --without-myspell-dicts --without-system-mspack --without-system-xt --without-fonts --without-nas --without-gpc --without-agg --without-ppds --wit!
 hout-afms %{stlflags} --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS"
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
@@ -1311,53 +1314,80 @@
 done
 popd
 
-#Set some aliases to canonical autocorrect language files for similar locales
+#Set some aliases to canonical autocorrect language files for locales with matching languages
 pushd $RPM_BUILD_ROOT/%{instdir}/share/autocorr
-en_GB_aliases="en-AU en-BS en-BZ en-CA en-IE en-IN en-JM en-NA en-NZ en-TT en-ZA en-ZW"
+en_GB_aliases="en-AU en-BS en-BZ en-CA en-GH en-IE en-IN en-JM en-NA en-NZ en-TT en-ZA en-ZW"
 for lang in $en_GB_aliases; do
         ln -sf acor_en-GB.dat acor_$lang.dat
 done
-en_US_aliases="en-PH"
 for lang in $en_US_aliases; do
         ln -sf acor_en-US.dat acor_$lang.dat
 done
+af_ZA_aliases="af-NA"
+for lang in $af_ZA_aliases; do
+        ln -sf acor_af-ZA.dat acor_$lang.dat
+done
+de_DE_aliases="de-AT de-BE de-CH de-LI de-LU"
+for lang in $de_DE_aliases; do
+        ln -sf acor_de-DE.dat acor_$lang.dic
+done
+es_ES_aliases="es-AR es-BO es-CL es-CO es-CR es-DO es-EC es-GT es-HN es-MX es-NI es-PA es-PE es-PR es-PY es-SV es-UY es-VE"
+for lang in $es_ES_aliases; do
+        ln -sf acor_es-ES.dat acor_$lang.dic
+done
+fr_FR_aliases="fr-BE fr-CA fr-CH fr-LU fr-MC"
+for lang in $fr_FR_aliases; do
+        ln -sf acor_fr-FR.dat acor_$lang.dic
+done
+it_IT_aliases="it-CH"
+for lang in $it_IT_aliases; do
+        ln -sf acor_it-IT.dat acor_$lang.dic
+done
+nl_NL_aliases="nl-BE"
+for lang in $nl_NL_aliases; do
+        ln -s acor_nl-NL.dat acor_$lang.dic
+done
+sv_SE_aliases="sv-FI"
+for lang in $sv_SE_aliases; do
+        ln -s acor_sv-SE.dat acor_$lang.dic
+done
 popd
 
 #auto generate the langpack file lists, format is...
-#langpack id, has help or not, extra linguistic data glob, script classification
+#langpack id, has help or not, autocorrection glob, script classification
 langpackdetails=\
 (\
-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		nolingu		western	\
-de	help		*_de_*		western 	el	help 		nolingu		western	\
-es	help		nolingu		western 	et	help		nolingu 	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		nolingu		western	\
-hr	nohelp		nolingu		western 	it	help		nolingu		western	\
-ja	help		nolingu		cjk 		ko	help		nolingu		cjk	\
-lt	nohelp		nolingu		western 	ms	nohelp		nolingu		western	\
-nb	help		nolingu		western 	nl	help		nolingu		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	\
-dz      help            nolingu         ctl
+af	help	acor_af-*.dat	western		ar	nohelp	noacor		ctl	\
+bg	help	acor_bg-BG.dat	western 	bn	help	noacor		western	\
+ca	help	noacor		western 	cs	help	acor_cs-CZ.dat	western	\
+cy	nohelp	noacor		western 	da	help	acor_da-DK.dat	western	\
+de	help	acor_de-*.dat	western 	el	help 	noacor		western	\
+es	help	acor_es-*.dat	western 	et	help	noacor		western	\
+eu	nohelp	noacor		western 	fi	nohelp	noacor		western	\
+fr	help	acor_fr-*.dat	western 	ga	nohelp	noacor		western	\
+gl	help	noacor		western 	gu-IN	nohelp	noacor		ctl	\
+pa-IN	help	noacor		ctl 		he	nohelp	noacor		ctl	\
+hi-IN	help	noacor		ctl 		hu	help	acor_hu-HU.dat	western	\
+hr	nohelp	noacor		western 	it	help	acor_it-*.dat	western	\
+ja	help	acor_ja-JP.dat	cjk 		ko	help	acor_ko-KR.dat	cjk	\
+lt	nohelp	noacor		western 	ms	nohelp	noacor		western	\
+nb	help	noacor		western 	nl	help	acor_nl-*.dat	western	\
+nn	help	noacor		western 	pl	help	acor_pl-PL.dat	western	\
+pt	help	acor_pt-PT.dat	western 	pt-BR	help	acor_pt-BR.dat	western	\
+ru	help	acor_ru-RU.dat	western 	sk	help	acor_sk-SK.dat	western	\
+sl	help	acor_sl-SI.dat	western 	sr-CS	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	\
+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	\
+mr-IN	nohelp	noacor		western		ml-IN	nohelp	noacor		western	\
+or-IN	nohelp	noacor		western		te-IN	nohelp	noacor		western	\
+ur-IN	nohelp	noacor		western		kn-IN	nohelp	noacor		western	\
+xh	help	noacor		western		ve	nohelp	noacor		western \
+st	help	noacor		western		ss	nohelp	noacor		western \
+nr	help	noacor		western		ns	help	noacor		western	\
+dz      help    noacor  	ctl
 )
 
 i=0
@@ -1371,7 +1401,7 @@
    fi
    i=$[i+1]
    lingu=${langpackdetails[$i]}
-   if [ ! "$lingu" = "nolingu" ]; then
+   if [ ! "$lingu" = "noacor" ]; then
      sed -e "s/LINGUPATTERN/$lingu/g" %{PATCH8} >> $lang.filelist
    fi
    i=$[i+1]
@@ -1385,20 +1415,11 @@
    i=$[i+1]
 done
 
-#remove the dictionaries, they are in hunspell-XX rpms
-grep -v DICT $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/dictionary.lst > $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/dictionary.lst.tmp
-grep -v HYPH $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/dictionary.lst.tmp > $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/dictionary.lst
-rm -f $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/dictionary.lst.tmp
-rm -rf $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/??_??.??? $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/README_??_??.txt $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/INSTALL_de.txt $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/*hyph*
-
 #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
 
-#skip the swahelli for now
-rm -rf $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/*sw_TZ*
-
 #enable gtk file dialog as the default
 rm -rf $RPM_BUILD_ROOT/%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-UseOOoFileDialogs.xcu
 
@@ -1425,6 +1446,16 @@
 #set standard permissions for rpmlint
 find $RPM_BUILD_ROOT/%{instdir} -exec chmod +w {} \;
 
+# move python bits into site-packages
+mkdir -p $RPM_BUILD_ROOT/%{python_py_sitearch}
+pushd $RPM_BUILD_ROOT/%{python_py_sitearch}
+echo "import sys" > uno.py
+echo "sys.path.append('%{instdir}/program')" >> uno.py
+cat $RPM_BUILD_ROOT/%{instdir}/program/uno.py >> uno.py
+rm -f $RPM_BUILD_ROOT/%{instdir}/program/uno.py*
+mv -f $RPM_BUILD_ROOT/%{instdir}/program/unohelper.py* .
+popd
+
 #ensure that no sneaky un-prelinkable, un-fpic or non executable shared libs 
 #have snuck through
 pic=0
@@ -1592,8 +1623,6 @@
 %files langpack-de 	-f de.filelist
 %files langpack-el_GR 	-f el.filelist
 %files langpack-en
-%{instdir}/share/dict/ooo/WordNet_license.txt
-%{instdir}/share/dict/ooo/th_en*
 %files langpack-es	-f es.filelist
 %files langpack-et_EE 	-f et.filelist
 %files langpack-eu_ES 	-f eu.filelist
@@ -2020,7 +2049,12 @@
 %{instdir}/program/viewdoc
 %dir %{instdir}/share
 %{instdir}/share/Scripts
-%{instdir}/share/autocorr
+%dir %{instdir}/share/autocorr
+%if %{langpacks}
+%{instdir}/share/autocorr/acor_en-*.dat
+%else
+%{instdir}/share/autocorr/*
+%endif
 %{instdir}/share/autotext
 %{instdir}/share/basic
 %dir %{instdir}/share/config
@@ -2040,12 +2074,6 @@
 %{instdir}/share/config/wizard
 %dir %{instdir}/share/dict
 %dir %{instdir}/share/dict/ooo
-%if %{langpacks}
-%{instdir}/share/dict/ooo/DicOOo.sxw
-%{instdir}/share/dict/ooo/dictionary.lst
-%else
-%{instdir}/share/dict/ooo/*
-%endif
 %dir %{instdir}/share/dtd
 %{instdir}/share/dtd/officedocument
 %{instdir}/share/fonts
@@ -2794,8 +2822,6 @@
 %{instdir}/program/pythonloader.unorc
 %{instdir}/program/pythonscript.py*
 %{instdir}/program/pyuno.so
-%{instdir}/program/uno.py*
-%{instdir}/program/unohelper.py*
 %dir %{instdir}/share
 %dir %{instdir}/share/Scripts
 %{instdir}/share/Scripts/python
@@ -2806,8 +2832,16 @@
 %dir %{instdir}/share/registry/modules/org/openoffice/Office
 %dir %{instdir}/share/registry/modules/org/openoffice/Office/Scripting
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
+%{python_py_sitearch}/uno.py*
+%{python_py_sitearch}/unohelper.py*
+
 
 %changelog
+* Thu Nov 29 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.1-9.5
+- split out thesauri
+- move autocorrect files into langpacks and make appropiate aliases
+- allow "import uno" to just work out of the box
+
 * Sat Nov 24 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.1-9.4
 - Resolves: rhbz#384391 add openoffice.org-2.3.1.ooo83930.sw.flushanchors.patch
 - split out libhyphen and hyphenators


--- openoffice.org.langpack-lingu.template DELETED ---




More information about the fedora-extras-commits mailing list