rpms/openoffice.org/devel openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch, 1.3, 1.4 openoffice.org.spec, 1.1464, 1.1465
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Fri Apr 4 14:29:24 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8346
Modified Files:
openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch
openoffice.org.spec
Log Message:
reenable dicts
openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch:
Index: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch 27 Mar 2008 15:13:50 -0000 1.3
+++ openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch 4 Apr 2008 14:29:04 -0000 1.4
@@ -1,358 +1,113 @@
-Index: source/editeng/unolingu.cxx
-===================================================================
-RCS file: /cvs/graphics/svx/source/editeng/unolingu.cxx,v
-retrieving revision 1.36
-diff -u -r1.36 unolingu.cxx
---- openoffice.org.orig/svx/source/editeng/unolingu.cxx 27 Jun 2007 18:01:18 -0000 1.36
-+++ openoffice.org/svx/source/editeng/unolingu.cxx 25 Nov 2007 11:54:12 -0000
-@@ -526,12 +526,15 @@
- // 1: regular OOo dictionary path
- // 2: user-dictionary path (where OOo linguistic by bad choice places downloaded dictionaries
- // 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 = 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
-Index: source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
-===================================================================
-RCS file: /cvs/whiteboard/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx,v
-retrieving revision 1.20
-diff -u -r1.20 hyphenimp.cxx
---- openoffice.org.orig/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx 11 Oct 2006 09:25:13 -0000 1.20
-+++ openoffice.org/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx 25 Nov 2007 13:59:17 -0000
-@@ -186,8 +186,10 @@
-
- int numusr; // number of user dictionary entries
- int numshr; // number of shared dictionary entries
-+ int numsys; // number of system dictionary entries
- dictentry * spdict = NULL; // shared dict entry pointer
- dictentry * updict = NULL; // user dict entry pointer
-+ std::vector<dictentry*> postsyspdict;
- std::vector<dictentry*> postspdict;
- std::vector<dictentry*> postupdict;
-
-@@ -234,15 +236,44 @@
- postspdict.push_back(&spdict[i]);
- }
-
-+ numsys = 0;
-+ const OUString sSystemDictPath(A2OU("file:///usr/share/hyphen"));
-+ 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(".dic")) == sPath.getLength()-4)
-+ {
-+ sal_Int32 nStartIndex = sPath.lastIndexOf(sal_Unicode('/')) + 1;
-+ sal_Int32 nIndex = nStartIndex;
-+ nIndex += strlen("hyph_");
-+ OUString sLang = sPath.getToken( 0, '_', nIndex );
-+ OUString sRegion = sPath.getToken( 0, '.', nIndex );
-+ sPath = sPath.copy(nStartIndex, nIndex - nStartIndex - 1);
-+ 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());
-+ postsyspdict.push_back(entry);
-+ }
-+ }
-+ }
-+
- numusr = postupdict.size();
- numshr = postspdict.size();
-+ numsys = postsyspdict.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 hyphenation dictionary
- // we can worry about that when and if issuezilla's flood in
-- numdict = numusr + numshr;
-+ numdict = numsys + numshr + numusr;
-
- if (numdict) {
- aDicts = new HDInfo[numdict];
-@@ -295,6 +326,32 @@
- k++;
- }
-
-+ // now add the system dictionaries
-+ for (i = 0; i < numsys; i++) {
-+ Locale nLoc( A2OU(postsyspdict[i]->lang), A2OU(postsyspdict[i]->region), OUString() );
-+ newloc = 1;
-+ for (j = 0; j < numlocs; j++) {
-+ if (nLoc == pLocale[j]) newloc = 0;
-+ }
-+ if (newloc) {
-+ pLocale[numlocs] = nLoc;
-+ numlocs++;
-+ }
-+ aDicts[k].aPtr = NULL;
-+ aDicts[k].aLoc = nLoc;
-+ aDicts[k].aEnc = 0;
-+ aDicts[k].aName = A2OU(postsyspdict[i]->filename);
-+ aDicts[k].apCC = new CharClass(nLoc);
-+
-+ free(postsyspdict[i]->filename);
-+ free(postsyspdict[i]->lang);
-+ free(postsyspdict[i]->region);
-+ delete postsyspdict[i];
-+
-+ k++;
-+ }
-+
-+
- // reallocate the size to just cover the unique locales
- aSuppLocales.realloc(numlocs);
-
-@@ -391,6 +448,7 @@
- OUString DictFN = aDicts[k].aName + A2OU(".dic");
- OUString userdictpath;
- OUString dictpath;
-+ const OUString systemdictpath(A2OU("/usr/share/hyphen/"));
-
- osl::FileBase::getSystemPathFromFileURL(
- aPathOpt.GetUserDictionaryPath() + A2OU("/"),
-@@ -402,11 +460,13 @@
-
- OString uTmp(OU2ENC(userdictpath + DictFN,osl_getThreadTextEncoding()));
- OString sTmp(OU2ENC(dictpath + DictFN,osl_getThreadTextEncoding()));
-+ OString dTmp(OU2ENC(systemdictpath + DictFN,osl_getThreadTextEncoding()));
-
- if ( ( dict = hnj_hyphen_load ( uTmp.getStr() ) ) == NULL )
- if ( ( dict = hnj_hyphen_load ( sTmp.getStr()) ) == NULL )
-+ if ( ( dict = hnj_hyphen_load ( dTmp.getStr()) ) == NULL )
- {
-- fprintf(stderr, "Couldn't find file %s and %s\n", OU2ENC(userdictpath + DictFN, osl_getThreadTextEncoding()), OU2ENC(userdictpath + DictFN, osl_getThreadTextEncoding() ));
-+ fprintf(stderr, "Couldn't find file %s and %s and %s\n", OU2ENC(userdictpath + DictFN, osl_getThreadTextEncoding()), OU2ENC(userdictpath + DictFN, osl_getThreadTextEncoding() ), OU2ENC(systemdictpath + DictFN, osl_getThreadTextEncoding() ));
- return NULL;
- }
- aDicts[k].aPtr = dict;
-Index: source/hyphenator/altlinuxhyph/hyphen/makefile.mk
-===================================================================
-RCS file: /cvs/whiteboard/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk,v
-retrieving revision 1.14
-diff -u -r1.14 makefile.mk
---- openoffice.org.orig/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk 31 Jul 2007 13:07:55 -0000 1.14
-+++ openoffice.org/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk 25 Nov 2007 13:59:17 -0000
-@@ -44,7 +44,7 @@
- .IF "$(SYSTEM_HYPH)" == "YES"
- HNJLIB=$(HYPHEN_LIB)
- .ELSE
--HNJLIB=-lhnj
-+HNJLIB=-lhyphen
- .ENDIF
- .ELIF "$(GUI)"=="OS2"
- HNJLIB=$(SLB)\libhnj.lib
-Index: source/spellcheck/spell/sspellimp.cxx
-===================================================================
-RCS file: /cvs/whiteboard/lingucomponent/source/spellcheck/spell/sspellimp.cxx,v
-retrieving revision 1.18
-diff -u -r1.18 sspellimp.cxx
---- openoffice.org.orig/lingucomponent/source/spellcheck/spell/sspellimp.cxx 16 Sep 2006 16:12:16 -0000 1.18
-+++ openoffice.org/lingucomponent/source/spellcheck/spell/sspellimp.cxx 25 Nov 2007 13:59:18 -0000
-@@ -160,14 +160,15 @@
-
- int numusr; // number of user dictionary entries
- int numshr; // number of shared dictionary entries
-+ int numsys; // number of system dictionary entries
- dictentry * spdict; // shared dict entry pointer
- dictentry * updict; // user dict entry pointer
- SvtPathOptions aPathOpt;
-
-+ std::vector<dictentry *> postsyspdict;
- std::vector<dictentry *> postspdict;
- std::vector<dictentry *> postupdict;
-
+diff -ru lingucomponent/source/lingutil/lingutil.cxx lingucomponent/source/lingutil/lingutil.cxx
+--- openoffice.org.orig/lingucomponent/source/lingutil/lingutil.cxx 2008-04-04 14:15:10.000000000 +0100
++++ openoffice.org/lingucomponent/source/lingutil/lingutil.cxx 2008-04-04 15:23:40.000000000 +0100
+@@ -146,6 +146,9 @@
+
+ rtl::OUString aFormatName;
+ String aDicExtension;
++ rtl::OUString aSystemDir;
++ rtl::OUString aSystemPrefix;
++ rtl::OUString aSystemSuffix;
+ bool bSpell = false;
+ bool bHyph = false;
+ bool bThes = false;
+@@ -153,18 +156,26 @@
+ {
+ aFormatName = A2OU("DICT_SPELL");
+ aDicExtension = String::CreateFromAscii( ".dic" );
++ aSystemDir = A2OU( "file:///usr/share/myspell" );
++ aSystemSuffix = aDicExtension;
+ bSpell = true;
+ }
+ else if (strcmp( pDicType, "HYPH" ) == 0)
+ {
+ aFormatName = A2OU("DICT_HYPH");
+ aDicExtension = String::CreateFromAscii( ".dic" );
++ aSystemDir = A2OU( "file:///usr/share/hyphen" );
++ aSystemPrefix = A2OU( "hyph_" );
++ aSystemSuffix = aDicExtension;
+ bHyph = true;
+ }
+ else if (strcmp( pDicType, "THES" ) == 0)
+ {
+ aFormatName = A2OU("DICT_THES");
+ aDicExtension = String::CreateFromAscii( ".dat" );
++ aSystemDir = A2OU( "file:///usr/share/mythes" );
++ aSystemPrefix = A2OU( "th_" );
++ aSystemSuffix = A2OU( "_v2.dat" );
+ bThes = true;
+ }
+
+@@ -173,7 +184,10 @@
+ return aRes;
+
+ dictentry * pDict = NULL; // shared dict entry pointer
+- std::set< dictentry *, lt_dictentry > aAvailableDics;
++
++ // set of languages to remember the language where it is already
++ // decided to make use of the dictionary.
++ std::set< LanguageType > aDicLangInUse;
+
+ const sal_Int16 USER_LAYER = 0;
+ for (int k = 0; k < 2; ++k)
+@@ -194,10 +208,6 @@
+ DictMgr aDictMgr( aSysPathToFile.getStr(), pDicType );
+ int nDicts = aDictMgr.get_list( &pDict );
+
+- // set of languages to remember the language where it is already
+- // decided to make use of the dictionary.
+- std::set< LanguageType > aDicLangInUse;
-
- if (!numdict) {
-
- // invoke a dictionary manager to get the user dictionary list
-@@ -214,14 +215,42 @@
- postspdict.push_back(&spdict[i]);
- }
-
-+ numsys = 0;
-+ const OUString sSystemDictPath(A2OU("file:///usr/share/myspell"));
-+ osl::Directory aSystemDicts(sSystemDictPath);
-+ if (aSystemDicts.open() == osl::FileBase::E_None)
+ // Test for existence of the actual dictionary files
+ // and remember the ones we like to use...
+ for (int i = 0; i < nDicts; ++i)
+@@ -248,6 +258,49 @@
+ }
+ }
+
++ osl::Directory aSystemDicts(aSystemDir);
++ if (aSystemDicts.open() == osl::FileBase::E_None)
++ {
++ osl::DirectoryItem aItem;
++ osl::FileStatus aFileStatus(FileStatusMask_FileURL);
++ while (aSystemDicts.getNextItem(aItem) == osl::FileBase::E_None)
++ {
++ aItem.getFileStatus(aFileStatus);
++ rtl::OUString sPath = aFileStatus.getFileURL();
++ if (sPath.lastIndexOf(aSystemSuffix) == sPath.getLength()-aSystemSuffix.getLength())
+ {
-+ 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(".dic")) == sPath.getLength()-4)
-+ {
-+ sal_Int32 nStartIndex = sPath.lastIndexOf(sal_Unicode('/')) + 1;
-+ sal_Int32 nIndex = nStartIndex;
-+ OUString sLang = sPath.getToken( 0, '_', nIndex );
-+ OUString sRegion = sPath.getToken( 0, '.', nIndex );
-+ sPath = sPath.copy(nStartIndex, nIndex - nStartIndex - 1);
-+ 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());
-+ postsyspdict.push_back(entry);
-+ }
-+ }
++ sal_Int32 nStartIndex = sPath.lastIndexOf(sal_Unicode('/')) + 1;
++ if (!sPath.match(aSystemPrefix, nStartIndex))
++ continue;
++ sal_Int32 nIndex = nStartIndex + aSystemPrefix.getLength();
++ rtl::OUString sLang = sPath.getToken( 0, '_', nIndex );
++ rtl::OUString sRegion = sPath.copy( nIndex, sPath.getLength() - nIndex - aSystemSuffix.getLength());
++ if (!sLang.getLength() || !sRegion.getLength())
++ continue;
++
++ // Thus we first get the language of the dictionary
++ LanguageType nLang = MsLangId::convertIsoNamesToLanguage(
++ sLang, sRegion );
++
++ if (aDicLangInUse.count( nLang ) == 0)
++ {
++ // remember the new language in use
++ aDicLangInUse.insert( nLang );
++
++ // add the dictionary to the resulting vector
++ SvtLinguConfigDictionaryEntry aDicEntry;
++ aDicEntry.aLocations.realloc(1);
++ aDicEntry.aLocaleNames.realloc(1);
++ rtl::OUString aLocaleName( MsLangId::convertLanguageToIsoString( nLang ) );
++ aDicEntry.aLocations[0] = sPath;
++ aDicEntry.aFormatName = aFormatName;
++ aDicEntry.aLocaleNames[0] = aLocaleName;
++ aRes.push_back( aDicEntry );
++ }
+ }
++ }
++ }
+
- numusr = postupdict.size();
- numshr = postspdict.size();
-+ numsys = postsyspdict.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 myspell dictionary
-- numdict = numshr + numusr;
-+ numdict = numsys + numshr + numusr;
-
- if (numdict) {
- aDicts = new Hunspell* [numdict];
-@@ -271,6 +300,31 @@
- k++;
- }
-
-+ // now add the system dictionaries
-+ for (i = 0; i < numsys; i++) {
-+ Locale nLoc( A2OU(postsyspdict[i]->lang), A2OU(postsyspdict[i]->region), OUString() );
-+ newloc = 1;
-+ for (j = 0; j < numlocs; j++) {
-+ if (nLoc == pLocale[j]) newloc = 0;
-+ }
-+ if (newloc) {
-+ pLocale[numlocs] = nLoc;
-+ numlocs++;
-+ }
-+ aDLocs[k] = nLoc;
-+ aDicts[k] = NULL;
-+ aDEncs[k] = 0;
-+ aDNames[k] = sSystemDictPath + A2OU("/") + A2OU(postsyspdict[i]->filename);
-+
-+ free(postsyspdict[i]->filename);
-+ free(postsyspdict[i]->lang);
-+ free(postsyspdict[i]->region);
-+ delete postsyspdict[i];
-+
-+ k++;
-+ }
-+
-+
- aSuppLocales.realloc(numlocs);
-
- } else {
-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);
+ return aRes;
+ }
- } else {
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1464
retrieving revision 1.1465
diff -u -r1.1464 -r1.1465
--- openoffice.org.spec 31 Mar 2008 07:48:11 -0000 1.1464
+++ openoffice.org.spec 4 Apr 2008 14:29:04 -0000 1.1465
@@ -1,6 +1,6 @@
%define oootag DEV300
%define ooomilestone 5
-%define rh_rpm_release 1
+%define rh_rpm_release 2
# undef to get english only and no-langpacks for a faster smoketest build
%define langpacks 1
@@ -1079,7 +1079,7 @@
%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
+%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
@@ -2868,6 +2868,9 @@
%{python_py_sitearch}/unohelper.py*
%changelog
+* Fri Apr 04 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.5.2
+- reenable dicts
+
* Mon Mar 31 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.5.1
- drop integrated workspace.cairotext01.patch
- fix up launchers
More information about the fedora-extras-commits
mailing list