diff --git a/.cvsignore b/.cvsignore index b255cff..56206de 100644 --- a/.cvsignore +++ b/.cvsignore @@ -8,3 +8,4 @@ kasumi-1.0.tar.gz kasumi-2.0.tar.gz kasumi-2.0.1.tar.gz kasumi-2.2.tar.gz +kasumi-2.3.tar.gz diff --git a/kasumi-2.2-fix-dict-breakage.patch b/kasumi-2.2-fix-dict-breakage.patch deleted file mode 100644 index 3017df5..0000000 --- a/kasumi-2.2-fix-dict-breakage.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -urNad kasumi-2.2~/KasumiDic.cxx kasumi-2.2/KasumiDic.cxx ---- kasumi-2.2~/KasumiDic.cxx 2006-06-20 23:41:47.000000000 +0900 -+++ kasumi-2.2/KasumiDic.cxx 2007-06-02 23:54:15.000000000 +0900 -@@ -38,6 +38,7 @@ - #include - #include - #include -+#include - - using namespace std; - -@@ -72,6 +73,9 @@ - const int FREQ_LBOUND = conf->getPropertyValueByInt("MinFrequency"); - const int FREQ_UBOUND = conf->getPropertyValueByInt("MaxFrequency"); - -+ int anthy_version = atoi(anthy_get_version_string()); -+ assert(anthy_version != 0); -+ - try{ - if(anthy_priv_dic_select_first_entry() == -1){ - // no word -@@ -79,7 +83,6 @@ - } - else if(anthy_priv_dic_select_first_entry() == -3) - { -- int anthy_version = str2int(string(anthy_get_version_string())); - if(anthy_version >= 7716) - { - // do not throw exception in the case that this doesn't fail to -@@ -109,16 +112,14 @@ - KasumiWord *newWord = KasumiWord::createNewWord(conf); - - newWord->setSound(string(sound)); -- int anthy_version = str2int(string(anthy_get_version_string())); -- if(anthy_version >= 7710) -+ if (anthy_version < 7710 && spelling[0] == ' ') { -+ // Measures against a defect of anthy. -+ // "anthy_priv_dic_get_word()" function returns -+ // a string whose first character is an unwated -+ // white space. -+ newWord->setSpelling(string(spelling+1)); -+ } else - newWord->setSpelling(string(spelling)); -- else -- { -- // Measures against a defect of anthy. -- // "anthy_priv_dic_get_word()" function returns a string -- // whose first character is an unwated white space. -- newWord->setSpelling(string(spelling+1)); -- } - newWord->setFrequency(freq); - newWord->setWordType(KasumiWordType::getWordTypeFromCannaTab(string(wt))); - appendWord(newWord); diff --git a/kasumi.spec b/kasumi.spec index 6ba0113..68ca61e 100644 --- a/kasumi.spec +++ b/kasumi.spec @@ -1,13 +1,12 @@ Name: kasumi -Version: 2.2 -Release: 6%{?dist} +Version: 2.3 +Release: 1%{?dist} License: GPLv2+ URL: http://kasumi.sourceforge.jp/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils, gtk2-devel gettext-devel anthy-devel automake autoconf Source0: %{name}-%{version}.tar.gz -Patch0: kasumi-2.2-fix-dict-breakage.patch Summary: An anthy dictionary management tool. @@ -18,7 +17,6 @@ Kasumi is a dictionary management tool for Anthy. %prep %setup -q -%patch0 -p1 %build %configure @@ -55,6 +53,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Oct 31 2007 Akira TAGOH - 2.3-1 +- New upstream release. +- kasumi-2.2-fix-dict-breakage.patch: removed. + * Thu Aug 23 2007 Akira TAGOH - 2.2-6 - Rebuild diff --git a/sources b/sources index abf9b72..f88da91 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d0c3a605fc95b89d4e102ffdd0b4c37d kasumi-2.2.tar.gz +bebc984bbcae8407d85161582e8b02a0 kasumi-2.3.tar.gz