Hello community, here is the log from the commit of package uim for openSUSE:Factory checked in at Thu Oct 13 19:44:11 CEST 2011.
-------- --- openSUSE:Factory/uim/uim.changes 2011-09-23 12:49:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/uim/uim.changes 2011-10-13 16:21:52.000000000 +0200 @@ -1,0 +2,13 @@ +Thu Oct 13 15:43:14 CEST 2011 - [email protected] + +- Add missing obsoletes/provides for uim-qt3 in baselibs.conf +- Fix crash and a registration issue in Firefox (bnc#723899) + +------------------------------------------------------------------- +Wed Oct 12 12:28:44 UTC 2011 - [email protected] + +- enable kde3 applet +- rename uim-qt to uim-qt3 +- remove obsolete version check + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- uim-fix-crash-in-firefox.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ uim.spec ++++++ --- /var/tmp/diff_new_pack.8lJDXh/_old 2011-10-13 19:44:06.000000000 +0200 +++ /var/tmp/diff_new_pack.8lJDXh/_new 2011-10-13 19:44:06.000000000 +0200 @@ -43,11 +43,10 @@ %endif BuildRequires: gnome-panel-devel BuildRequires: qt3-devel +BuildRequires: kdebase3-devel BuildRequires: update-desktop-files BuildRequires: xemacs -%if 0%{?suse_version} > 1020 BuildRequires: fdupes -%endif Version: 1.7.1 Release: 20 # xorg-x11-libXdmcp-devel libgnomeprintui-devel @@ -62,6 +61,7 @@ Source4: baselibs.conf Patch10: uim-sigscheme-build-fixes.diff Patch11: fix-libs.patch +Patch12: uim-fix-crash-in-firefox.diff PreReq: %{_bindir}/touch Provides: locale(xorg-x11:ja) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -118,14 +118,16 @@ %description applet-gnome GNOME applet for uim -%package qt +%package qt3 License: GPLv2+ Summary: Qt3 input module plugin for uim Group: System/I18n/Japanese Requires: %{name} = %{version} Provides: locale(qt3:ja) +Provides: uim-qt = %{version} +Obsoletes: uim-qt -%description qt +%description qt3 Qt3 input module plugin for uim %package qt4 @@ -139,10 +141,22 @@ %description qt4 Qt4 input module plugin for uim +%package kde3 +Summary: KDE3 Applet for Uim +Group: User Interface/Desktops +Requires: uim = %{version}-%{release} +Requires: uim-qt3 + +%description kde3 +Uim is a multilingual input method library. Uim aims to +provide secure and useful input methods for all +languages. + %prep %setup0 -q %patch10 -p1 %patch11 -p1 +%patch12 -p1 cp emacs/README README.emacs iconv -f euc-jp -t utf-8 < emacs/README.ja > README.ja.emacs @@ -158,7 +172,9 @@ --with-qt\ --with-qt-immodule \ --with-qt4 \ - --with-qt4-immodule + --with-qt4-immodule \ + --enable-kde-applet + make %{?_smp_mflags} %install @@ -314,7 +330,7 @@ %{_libdir}/bonobo/servers/* %endif -%files qt -f uim-chardict-qt.lang +%files qt3 -f uim-chardict-qt.lang %defattr(-, root, root) %{_bindir}/uim-*-qt %{_prefix}/lib/uim/uim-*-qt @@ -326,4 +342,10 @@ %{_prefix}/lib/uim/uim-*-qt4 %{_libdir}/qt4/plugins/inputmethods/*.so +%files kde3 +%defattr (-, root, root, -) +%doc AUTHORS COPYING ChangeLog* NEWS README +/opt/kde3/%_lib/kde3/uim_panelapplet.so +/opt/kde3/share/apps/kicker/applets/uimapplet.desktop + %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.8lJDXh/_old 2011-10-13 19:44:06.000000000 +0200 +++ /var/tmp/diff_new_pack.8lJDXh/_new 2011-10-13 19:44:06.000000000 +0200 @@ -23,7 +23,9 @@ postun "<prefix>%{_bindir}/gtk-query-immodules-3.0 --update-cache" postun "%endif" supplements "packageand(uim:gtk3-<targettype>)" -uim-qt +uim-qt3 supplements "packageand(uim:qt3-<targettype>)" + obsoletes "uim-qt-<targettype>" + provides "uim-qt-<targettype> = <version>" uim-qt4 supplements "packageand(uim:libqt4-<targettype>)" ++++++ uim-fix-crash-in-firefox.diff ++++++ --- gtk/compose.c | 1 + gtk/uim-cand-win-gtk.c | 2 +- gtk/uim-cand-win-tbl-gtk.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) --- a/gtk/compose.c +++ b/gtk/compose.c @@ -767,6 +767,7 @@ im_uim_release_compose_tree() { FreeComposeTree(g_tree); + g_tree = NULL; } static int --- a/gtk/uim-cand-win-gtk.c +++ b/gtk/uim-cand-win-gtk.c @@ -107,7 +107,7 @@ GType uim_cand_win_gtk_register_type(GTypeModule *module) { - if (!cand_win_type) + //if (!cand_win_type) cand_win_type = g_type_module_register_type(module, GTK_TYPE_WINDOW, "UIMCandWinGtk", --- a/gtk/uim-cand-win-tbl-gtk.c +++ b/gtk/uim-cand-win-tbl-gtk.c @@ -136,7 +136,7 @@ GType uim_cand_win_tbl_gtk_register_type(GTypeModule *module) { - if (!cand_win_tbl_type) + //if (!cand_win_tbl_type) cand_win_tbl_type = g_type_module_register_type(module, UIM_TYPE_CAND_WIN_GTK, "UIMCandWinTblGtk", continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
