Hello community,
here is the log from the commit of package scim
checked in at Wed Jan 10 17:57:58 CET 2007.
--------
--- scim/scim.changes 2006-11-30 04:26:54.000000000 +0100
+++ /mounts/work_src_done/STABLE/scim/scim.changes 2007-01-10 13:32:23.000000000 +0100
@@ -1,0 +2,8 @@
+Wed Jan 10 12:47:23 CET 2007 - mfabian@suse.de
+
+- Bugzilla #232014: OpenOffice requires the preedit caret to be
+ at the end of the preedit string or weird behaviour will
+ occur. Fixed by Zhe Su .
+- Gnome has moved to /usr for openSUSE > 10.2.
+
+-------------------------------------------------------------------
New:
----
bugzilla-232014-fix-for-openoffice.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ scim.spec ++++++
--- /var/tmp/diff_new_pack.nj8141/_old 2007-01-10 17:57:39.000000000 +0100
+++ /var/tmp/diff_new_pack.nj8141/_new 2007-01-10 17:57:39.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package scim (Version 1.4.5)
#
-# 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.
#
@@ -14,7 +14,7 @@
BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ graphviz gtk2-devel intltool libxslt perl-XML-Parser update-desktop-files
Summary: Smart Chinese/Common Input Method platform
Version: 1.4.5
-Release: 20
+Release: 29
License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Group: System/I18n/Chinese
Autoreqprov: on
@@ -36,6 +36,7 @@
Patch3: language-name.patch
Patch4: bugzilla-221326-ltc27940.patch
Patch5: bugzilla-224796-compose-key-fix.patch
+Patch6: bugzilla-232014-fix-for-openoffice.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -77,6 +78,11 @@
%define build_scim_setup 1
%define build_panel_gtk 1
%define build_gtk_utils 1
+%if %suse_version > 1020
+%define gnome_prefix /usr
+%else
+%define gnome_prefix /opt/gnome
+%endif
%setup -q -n %{name}-%{version}
%patch0 -p1
%patch1 -p1
@@ -84,6 +90,7 @@
%patch3 -p0
%patch4 -p2
%patch5 -p0
+%patch6 -p0
find . -type f | xargs chmod u+w
UTF_8_LOCALES=$(locale -a | grep utf8 | perl -p -e "s/utf8/UTF-8/; s/\n/,/; " | perl -p -e "s/,$//")
perl -pi -e "s/\/SupportedUnicodeLocales =.*/\/SupportedUnicodeLocales = $UTF_8_LOCALES/" ./configs/global
@@ -91,7 +98,7 @@
%build
libtoolize --force
-autoreconf -I /opt/gnome/share/aclocal --force --install --verbose
+autoreconf -I %{gnome_prefix}/share/aclocal --force --install --verbose
if [ ! -f po/Makevars -a -f po/Makevars.template ] ; then
cp po/Makevars.template po/Makevars
fi
@@ -140,7 +147,11 @@
%endif
--disable-schemas-install \
--enable-debug \
+%if %suse_version > 1020
+ --with-gconf-schema-file-dir=/etc/gconf/schemas \
+%else
--with-gconf-schema-file-dir=/etc/opt/gnome/gconf/schemas \
+%endif
--enable-ld-version-script
make top_builddir=$(pwd)
# build documentation:
@@ -148,13 +159,12 @@
make -C docs/manual/zh_CN html
%install
-[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make DESTDIR=${RPM_BUILD_ROOT} top_builddir=$(pwd) install
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI}
rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/*/*.{a,la}
-rm -f ${RPM_BUILD_ROOT}//opt/gnome/%_lib/gtk-2.0/immodules/im-scim.{a,la}
+rm -f ${RPM_BUILD_ROOT}/%{gnome_prefix}/%_lib/gtk-2.0/immodules/im-scim.{a,la}
# install user manual
mkdir -p docs/dist/manual/zh_CN/figures/
cp -a docs/manual/zh_CN/user-manual.{html,xml} docs/dist/manual/zh_CN/
@@ -293,7 +303,7 @@
%{_libdir}/scim-1.0/*/Config/socket.so
%endif
%if %{build_gtk2_immodule}
-/opt/gnome/%_lib/gtk-2.0/immodules/im-scim.so
+%{gnome_prefix}/%_lib/gtk-2.0/immodules/im-scim.so
%endif
%files devel
@@ -306,6 +316,11 @@
%{_includedir}/scim-1.0
%changelog -n scim
+* Wed Jan 10 2007 - mfabian@suse.de
+- Bugzilla #232014: OpenOffice requires the preedit caret to be
+ at the end of the preedit string or weird behaviour will
+ occur. Fixed by Zhe Su .
+- Gnome has moved to /usr for openSUSE > 10.2.
* Thu Nov 30 2006 - zsu@suse.de
- Bugzilla 224796:
Fixed a wrong compose key entry in scim_compose_key_data.h,
++++++ bugzilla-232014-fix-for-openoffice.patch ++++++
--- extras/gtk2_immodule/gtkimcontextscim.cpp.old 2007-01-10 18:09:50.000000000 +0800
+++ extras/gtk2_immodule/gtkimcontextscim.cpp 2007-01-10 18:54:29.000000000 +0800
@@ -2084,6 +2084,7 @@
g_signal_emit_by_name(_focused_ic, "preedit-start");
ic->impl->preedit_started = true;
}
+ ic->impl->preedit_caret = str.length ();
g_signal_emit_by_name(ic, "preedit-changed");
} else {
_panel_client.update_preedit_string (ic->id, str, attrs);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org