Hello community,
here is the log from the commit of package kasumi
checked in at Thu Mar 15 01:41:11 CET 2007.
--------
--- kasumi/kasumi.changes 2006-08-29 17:45:43.000000000 +0200
+++ /mounts/work_src_done/STABLE/kasumi/kasumi.changes 2007-03-14 12:52:51.000000000 +0100
@@ -1,0 +2,12 @@
+Wed Mar 14 12:51:57 CET 2007 - mfabian@suse.de
+
+- enable 64bit patch again.
+
+-------------------------------------------------------------------
+Tue Mar 13 14:47:38 CET 2007 - mfabian@suse.de
+
+- updating to 2.2 (also fixes Bugzilla #253788)
+ • man page added
+ • Italian translations added
+
+-------------------------------------------------------------------
Old:
----
kasumi-2.0.1.tar.bz2
New:
----
desktop.patch
kasumi-2.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kasumi.spec ++++++
--- /var/tmp/diff_new_pack.w26798/_old 2007-03-15 01:40:48.000000000 +0100
+++ /var/tmp/diff_new_pack.w26798/_new 2007-03-15 01:40:48.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package kasumi (Version 2.0.1)
+# spec file for package kasumi (Version 2.2)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -12,17 +12,18 @@
Name: kasumi
BuildRequires: anthy-devel gcc-c++ gtk2-devel update-desktop-files
-License: GPL
+License: GNU General Public License (GPL)
Group: System/I18n/Japanese
Autoreqprov: on
Provides: locale(anthy:ja)
-Version: 2.0.1
+Version: 2.2
Release: 1
URL: http://kasumi.sourceforge.jp/
-Source0: http://osdn.dl.sourceforge.jp/kasumi/20684/kasumi-2.0.1.tar.bz2
+Source0: http://osdn.dl.sourceforge.jp/kasumi/22902/kasumi-2.2.tar.bz2
Patch0: 64bit.patch
Patch1: gcc41.patch
Patch2: typo.patch
+Patch3: desktop.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Dictionary Tool for Anthy
@@ -38,8 +39,9 @@
%prep
%setup0 -q -n %{name}-%{version}
%patch0 -p1
-%patch1 -p1
+#%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
rm -f config.cache
@@ -48,7 +50,6 @@
libtoolize --force
autoreconf --force --install
export CFLAGS="$RPM_OPT_FLAGS"
-export CFLAGS="-g -O0"
./configure --prefix=/usr \
--bindir=%{_bindir} \
--libdir=%{_libdir} \
@@ -60,19 +61,27 @@
%install
make DESTDIR=$RPM_BUILD_ROOT install
+%suse_update_desktop_file -i %name System SystemSetup
%find_lang kasumi
%clean
-#[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
+rm -rf $RPM_BUILD_ROOT
%files -n kasumi -f kasumi.lang
%defattr(-, root, root)
%doc AUTHORS COPYING ChangeLog INSTALL NEWS README
%{_bindir}/*
-%dir %{_datadir}/kasumi/
-%dir %{_datadir}/kasumi/kasumi.png
-
-%changelog -n kasumi
+%{_datadir}/pixmaps/kasumi.png
+%{_datadir}/applications/kasumi.desktop
+%{_mandir}/man1/*
+
+%changelog
+* Wed Mar 14 2007 - mfabian@suse.de
+- enable 64bit patch again.
+* Tue Mar 13 2007 - mfabian@suse.de
+- updating to 2.2 (also fixes Bugzilla #253788)
+ • man page added
+ • Italian translations added
* Mon Aug 28 2006 - mfabian@suse.de
- update to 2.0.1.
• search function for KasumiMainWindow
++++++ 64bit.patch ++++++
--- /var/tmp/diff_new_pack.w26798/_old 2007-03-15 01:40:48.000000000 +0100
+++ /var/tmp/diff_new_pack.w26798/_new 2007-03-15 01:40:48.000000000 +0100
@@ -1,6 +1,6 @@
-diff -ru kasumi-2.0.1.orig/KasumiDic.cxx kasumi-2.0.1/KasumiDic.cxx
---- kasumi-2.0.1.orig/KasumiDic.cxx 2006-05-26 19:41:25.000000000 +0200
-+++ kasumi-2.0.1/KasumiDic.cxx 2006-08-29 17:24:58.000000000 +0200
+diff -ru kasumi-2.2.orig/KasumiDic.cxx kasumi-2.2/KasumiDic.cxx
+--- kasumi-2.2.orig/KasumiDic.cxx 2006-06-20 16:41:47.000000000 +0200
++++ kasumi-2.2/KasumiDic.cxx 2007-03-13 18:18:16.000000000 +0100
@@ -148,7 +148,7 @@
}
}
@@ -10,9 +10,9 @@
{
int flag = 0;
-diff -ru kasumi-2.0.1.orig/KasumiDic.hxx kasumi-2.0.1/KasumiDic.hxx
---- kasumi-2.0.1.orig/KasumiDic.hxx 2006-05-26 19:41:25.000000000 +0200
-+++ kasumi-2.0.1/KasumiDic.hxx 2006-08-29 17:25:39.000000000 +0200
+diff -ru kasumi-2.2.orig/KasumiDic.hxx kasumi-2.2/KasumiDic.hxx
+--- kasumi-2.2.orig/KasumiDic.hxx 2006-05-26 19:41:25.000000000 +0200
++++ kasumi-2.2/KasumiDic.hxx 2007-03-13 18:19:11.000000000 +0100
@@ -56,7 +56,7 @@
~KasumiDic();
void store() throw(KasumiException);
@@ -31,21 +31,21 @@
// int getUpperBoundOfWordID();
};
-diff -ru kasumi-2.0.1.orig/KasumiDicEventListener.hxx kasumi-2.0.1/KasumiDicEventListener.hxx
---- kasumi-2.0.1.orig/KasumiDicEventListener.hxx 2006-05-26 19:41:25.000000000 +0200
-+++ kasumi-2.0.1/KasumiDicEventListener.hxx 2006-08-29 17:25:53.000000000 +0200
-@@ -35,7 +35,7 @@
- class KasumiDicEventListener{
+diff -ru kasumi-2.2.orig/KasumiDicEventListener.hxx kasumi-2.2/KasumiDicEventListener.hxx
+--- kasumi-2.2.orig/KasumiDicEventListener.hxx 2006-06-26 08:21:40.000000000 +0200
++++ kasumi-2.2/KasumiDicEventListener.hxx 2007-03-13 18:19:45.000000000 +0100
+@@ -36,7 +36,7 @@
private:
public:
-- virtual void removedWord(size_t id) = 0;
-+ virtual void removedWord(unsigned int id) = 0;
- virtual void appendedWord(KasumiWord *word) = 0;
- virtual void modifiedWord(KasumiWord *word) = 0;
+ virtual ~KasumiDicEventListener() {};
+- virtual void removedWord(size_t id) = 0;
++ virtual void removedWord(unsigned int id) = 0;
+ virtual void appendedWord(KasumiWord *word) = 0;
+ virtual void modifiedWord(KasumiWord *word) = 0;
};
-diff -ru kasumi-2.0.1.orig/KasumiMainWindow.cxx kasumi-2.0.1/KasumiMainWindow.cxx
---- kasumi-2.0.1.orig/KasumiMainWindow.cxx 2006-05-29 06:59:37.000000000 +0200
-+++ kasumi-2.0.1/KasumiMainWindow.cxx 2006-08-29 17:26:17.000000000 +0200
+diff -ru kasumi-2.2.orig/KasumiMainWindow.cxx kasumi-2.2/KasumiMainWindow.cxx
+--- kasumi-2.2.orig/KasumiMainWindow.cxx 2006-11-28 13:57:16.000000000 +0100
++++ kasumi-2.2/KasumiMainWindow.cxx 2007-03-13 18:32:15.000000000 +0100
@@ -435,7 +435,7 @@
void KasumiMainWindow::ClickedRemoveButton(){
GtkTreeModel *model = GTK_TREE_MODEL(SortList);
@@ -73,16 +73,16 @@
gtk_tree_model_get(SortList, &iter, COL_ID, &id, -1);
KasumiWord *word = KasumiWord::getWordFromID(id);
-@@ -587,7 +587,7 @@
+@@ -586,7 +586,7 @@
+ GtkTreeIter iter;
KasumiWord *word;
- bool fromFirst = false;
GtkTreeIter StartIter;
- int id;
+ unsigned int id;
string searchString = string(gtk_entry_get_text(GTK_ENTRY(mSearchEntry)));
string comparedString;
- GtkWidget *dialog;
-@@ -714,7 +714,7 @@
+
+@@ -692,7 +692,7 @@
gtk_tree_view_column_set_sort_order(column,order);
}
@@ -91,7 +91,7 @@
refresh();
modificationFlag = true;
}
-@@ -754,7 +754,7 @@
+@@ -735,7 +735,7 @@
}
void KasumiMainWindow::modifiedWord(KasumiWord *word){
@@ -100,7 +100,7 @@
GtkTreeIter *iter = findCorrespondingIter(id);
if(iter != NULL)
-@@ -772,8 +772,8 @@
+@@ -753,8 +753,8 @@
}
// Do not returns iter of SortList but WordList
@@ -111,7 +111,7 @@
GtkTreeModel *model = GTK_TREE_MODEL(WordList);
GtkTreeIter *iter = (GtkTreeIter*)calloc(1,sizeof(GtkTreeIter));
-@@ -978,7 +978,7 @@
+@@ -959,7 +959,7 @@
i = key.find("+",0);
@@ -120,7 +120,7 @@
return (GdkModifierType)0;
}
-@@ -997,7 +997,7 @@
+@@ -978,7 +978,7 @@
GtkTreeIter *a,
GtkTreeIter *b,
gpointer user_data){
@@ -129,7 +129,7 @@
gtk_tree_model_get(model, a, COL_ID, &id_a, -1);
gtk_tree_model_get(model, b, COL_ID, &id_b, -1);
KasumiWord *word_a = KasumiWord::getWordFromID(id_a);
-@@ -1010,7 +1010,7 @@
+@@ -991,7 +991,7 @@
GtkTreeIter *iter_a,
GtkTreeIter *iter_b,
gpointer user_data){
@@ -138,7 +138,7 @@
gtk_tree_model_get(model, iter_a, COL_ID, &id_a, -1);
gtk_tree_model_get(model, iter_b, COL_ID, &id_b, -1);
KasumiWord *word_a = KasumiWord::getWordFromID(id_a);
-@@ -1075,7 +1075,7 @@
+@@ -1033,7 +1033,7 @@
GtkTreeIter *iter_a,
GtkTreeIter *iter_b,
gpointer user_data){
@@ -147,10 +147,10 @@
gtk_tree_model_get(model, iter_a, COL_ID, &id_a, -1);
gtk_tree_model_get(model, iter_b, COL_ID, &id_b, -1);
KasumiWord *word_a = KasumiWord::getWordFromID(id_a);
-diff -ru kasumi-2.0.1.orig/KasumiMainWindow.hxx kasumi-2.0.1/KasumiMainWindow.hxx
---- kasumi-2.0.1.orig/KasumiMainWindow.hxx 2006-05-29 06:59:37.000000000 +0200
-+++ kasumi-2.0.1/KasumiMainWindow.hxx 2006-08-29 17:26:55.000000000 +0200
-@@ -174,7 +174,7 @@
+diff -ru kasumi-2.2.orig/KasumiMainWindow.hxx kasumi-2.2/KasumiMainWindow.hxx
+--- kasumi-2.2.orig/KasumiMainWindow.hxx 2006-06-23 15:39:20.000000000 +0200
++++ kasumi-2.2/KasumiMainWindow.hxx 2007-03-13 18:33:03.000000000 +0100
+@@ -228,7 +228,7 @@
void changedWordTypeColumn(GtkComboBox *combo);
void FindNext(bool fromCurrent);
@@ -159,7 +159,7 @@
void SortBy(GtkTreeViewColumn *column);
-@@ -182,7 +182,7 @@
+@@ -236,7 +236,7 @@
KasumiMainWindow(KasumiDic *aDictionary, KasumiConfiguration *conf);
virtual ~KasumiMainWindow();
void refresh();
@@ -168,9 +168,9 @@
void appendedWord(KasumiWord *word);
void modifiedWord(KasumiWord *word);
};
-diff -ru kasumi-2.0.1.orig/KasumiWord.cxx kasumi-2.0.1/KasumiWord.cxx
---- kasumi-2.0.1.orig/KasumiWord.cxx 2006-05-29 16:04:39.000000000 +0200
-+++ kasumi-2.0.1/KasumiWord.cxx 2006-08-29 17:27:15.000000000 +0200
+diff -ru kasumi-2.2.orig/KasumiWord.cxx kasumi-2.2/KasumiWord.cxx
+--- kasumi-2.2.orig/KasumiWord.cxx 2006-10-14 09:31:21.000000000 +0200
++++ kasumi-2.2/KasumiWord.cxx 2007-03-13 18:33:49.000000000 +0100
@@ -41,7 +41,7 @@
iconv_t KasumiWord::IconvUTF8_To_EUCJP = iconv_open("EUC-JP", "UTF-8");
iconv_t KasumiWord::IconvEUCJP_To_UTF8 = iconv_open("UTF-8", "EUC-JP");
@@ -180,7 +180,7 @@
vector