Hello community, here is the log from the commit of package ibus for openSUSE:Factory checked in at 2013-07-07 22:18:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibus (Old) and /work/SRC/openSUSE:Factory/.ibus.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus" Changes: -------- --- /work/SRC/openSUSE:Factory/ibus/ibus.changes 2013-04-03 12:53:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ibus.new/ibus.changes 2013-07-07 22:18:06.000000000 +0200 @@ -1,0 +2,46 @@ +Thu Jul 4 15:41:12 UTC 2013 - [email protected] + +- Merge branches on M17N:Devel and home:dimstar:branches:GNOME:Factory + * Merge changelog and spec written by [email protected] +- Update to 1.5.2 by [email protected] + * Implement use-system-keyboard-layout + * Fix crash of ibus-setup +- Update to 1.5.1 by [email protected] + * Add fr(bepo) XKB engine + * Fix crash +- Update to 1.5.0 by [email protected] + * Renew IM-switch UI, logic, and shortcut customization + * Integrate XKB keyboard layouts into IME. Now ibus can manage both + IME and XKB layouts seamlessly + * Improve ibus performance by replace some python components with + vala implementations + * Improve gobject-introspection support + * Improve vala language support + * New functions to restrict config signal: ibus_config_watch/unwatch + * Remove gnome-icon-theme-legacy dependency. + * Add version property in IBusEngineDesc. + * Add IBusProperty.symbol for the short label. + * Support dconf 0.13.4 + * Add ibus command line tool + * Improve unit test + * ibus-daemon now monitors .xml files by default + * "make check" does not require "make install" + * Support out-of-tree build + * pygobject override is added to help migrate from the old python binding. + * Many bug fixings. +- Switch to dconf from GConf +- Add python bindings +- Add vala bindings +- Drop obsoleted patches: + * ibus-fix-default-preload-engines.patch + * ibus-fix-docs-build-error.patch + * ibus-fix-tray-icon-on-gnome-3.6.patch + * ibus_indicator-14.patch +- Obsoletes ibus-gnome-shell +- Separate translation files into ibus-lang +- Rename libibus-1_0-0 subpackage to libibus-1_0-5, following + upstreams soname change. +- Clean up spec file + * remove special cases for 11.4 and 12.1 + +------------------------------------------------------------------- Old: ---- ibus-1.4.2.tar.gz ibus-fix-default-preload-engines.patch ibus-fix-docs-build-error.patch ibus-fix-tray-icon-on-gnome-3.6.patch ibus_indicator-14.patch xim.d-ibus New: ---- ibus-1.5.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus.spec ++++++ --- /var/tmp/diff_new_pack.V6ajoZ/_old 2013-07-07 22:18:07.000000000 +0200 +++ /var/tmp/diff_new_pack.V6ajoZ/_new 2013-07-07 22:18:07.000000000 +0200 @@ -16,12 +16,8 @@ # -%define build_gtk3 (0%{suse_version} >= 1140) -%define build_without_dbus_autolaunch (0%{suse_version} >= 1210) -%define domain_name %{name}10 - Name: ibus -Version: 1.4.2 +Version: 1.5.2 Release: 0 Url: http://code.google.com/p/ibus/ Summary: Intelligent Input Bus for Linux OS @@ -29,25 +25,17 @@ Group: System/I18n/Chinese Source: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz -Source1: xim.d-ibus Source2: ibus-README.suse Source3: xim.ibus.suse.template Source4: xim.d-ibus-121 Patch0: ibus-python-install-dir.patch -Patch1: ibus-fix-default-preload-engines.patch -# PATCH-FIX-OPENSUSE ibus-fix-docs-build-error.patch -Patch2: ibus-fix-docs-build-error.patch -# PATCH-FIX-OPENSUSE ibus-fix-tray-icon-on-gnome-3.6.patch -Patch3: ibus-fix-tray-icon-on-gnome-3.6.patch -# PATCH-FIX-OPENSUSE ibus_indicator-14.patch -Patch4: ibus_indicator-14.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: /usr/bin/touch Provides: locale(ja;ko;zh) BuildRequires: dbus-1-glib-devel BuildRequires: dbus-1-python-devel >= 0.83.0 +BuildRequires: dconf-devel >= 0.7.5 BuildRequires: fdupes -BuildRequires: gconf2-devel >= 2.12 BuildRequires: gettext-devel BuildRequires: glib2-devel >= 2.26.0 BuildRequires: gobject-introspection-devel >= 0.9.6 @@ -60,16 +48,21 @@ BuildRequires: python >= 2.5 BuildRequires: python-gobject2-devel BuildRequires: update-desktop-files +BuildRequires: pkgconfig(vapigen) >= 0.16 Requires: dbus-1-python -Requires: gconf2 +Requires: dconf Requires: gobject-introspection Requires: iso-codes -Requires: libibus-1_0-0 = %{version} +Requires: libibus-1_0-5 = %{version} Requires: notification-daemon Requires: python-gtk Requires: python-notify Requires: python-xdg -%gconf_schemas_prereq +%if 0%{suse_version} >= 1220 +Requires: typelib-1_0-Gtk-2_0 +Requires: typelib-1_0-Gtk-3_0 +%endif +Obsoletes: ibus-gnome-shell %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") %define gtk_binary_version %(pkg-config --variable=gtk_binary_version gtk+-2.0) @@ -79,11 +72,11 @@ full featured and user friendly input method user interface. It also may help developers to develop input method easily. -%package -n libibus-1_0-0 +%package -n libibus-1_0-5 Summary: IBus libraries Group: System/I18n/Chinese -%description -n libibus-1_0-0 +%description -n libibus-1_0-5 This package contains the libraries for IBus %package -n typelib-1_0-IBus-1_0 @@ -103,8 +96,6 @@ %description gtk This package contains ibus im module for gtk2 -%if %{build_gtk3} - %package gtk3 Summary: IBus im module for gtk3 @@ -116,18 +107,16 @@ %description gtk3 This package contains ibus im module for gtk3 -%endif -%package gnome-shell -# This implicitly draws in the GNOME Shell itself and thus is separate -Summary: GNOME Shell integration for IBus -Group: System/GUI/GNOME -BuildArch: noarch -Supplements: packageand(gnome-shell:ibus) - -%description gnome-shell -The package contains the files for integrating IBus into the GNOME -Shell. +%package -n python-ibus +Summary: Python module for ibus +Group: System/I18n/Chinese +Requires: %{name} = %{version} + +%description -n python-ibus +This package contains python module for ibus + + %package devel Summary: Development tools for ibus @@ -136,45 +125,38 @@ Requires: glib2-devel Requires: gtk-doc Requires: ibus = %{version} +Requires: libibus-1_0-5 = %{version} Requires: typelib-1_0-IBus-1_0 = %{version} %description devel The ibus-devel package contains the header files and developer docs for ibus. - +%lang_package %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%if 0%{suse_version} >= 1230 -%patch3 -p1 -%patch4 -p1 -%endif %build autoreconf -fi intltoolize -f %configure --disable-static \ -%if %{build_gtk3} --enable-gtk3 \ -%endif - --disable-iso-codes-check \ - --disable-gobject-introspection \ + --enable-vala \ + --enable-python-library \ + --enable-introspection \ + --disable-gconf \ + --enable-dconf \ --enable-gtk-doc \ --libexecdir=%{_prefix}/%{_lib}/ibus -make %{?_smp_mflags} +make %{?jobs:-j %jobs} %install -make install DESTDIR="%buildroot" +%makeinstall # autostart mkdir -p $RPM_BUILD_ROOT/etc/X11/xim.d/ -%if %{build_without_dbus_autolaunch} install -m 644 $RPM_SOURCE_DIR/xim.d-ibus-121 $RPM_BUILD_ROOT/etc/X11/xim.d/ibus -%else -install -m 644 $RPM_SOURCE_DIR/xim.d-ibus $RPM_BUILD_ROOT/etc/X11/xim.d/ibus -%endif + sed -i 1i"SYS_LIB=%{_lib}" $RPM_BUILD_ROOT/etc/X11/xim.d/ibus PRIORITY=40 @@ -190,16 +172,6 @@ done popd -# fix python-bytecode-inconsistent-mtime -pushd %{buildroot}%{_datadir}/ibus/ui/gtk -%py_compile i18n.py -mv ./i18n.pyc %{buildroot}%{_datadir}/ibus/setup/i18n.pyc -popd -pushd %{buildroot}%{_datadir}/ibus/ui/gtk -%py_compile -O engineabout.py -mv ./engineabout.pyo %{buildroot}%{_datadir}/ibus/setup/engineabout.pyo -popd - # remove static libs rm -f $RPM_BUILD_ROOT/%{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.*a rm -f $RPM_BUILD_ROOT/%{_libdir}/libibus-*.*a @@ -212,69 +184,63 @@ %suse_update_desktop_file %name Utility DesktopUtility %suse_update_desktop_file %name-setup System Utility settings -%find_lang %{domain_name} -%find_gconf_schemas -cat %{name}.schemas_list %{domain_name}.lang > %{name}.lst %fdupes %buildroot/%_prefix %fdupes -s $RPM_BUILD_ROOT -%if 0%{suse_version} >= 1230 -install -m755 -d %{buildroot}%{_datadir}/gnome-shell/extensions/[email protected] -install -m644 [email protected]/* %{buildroot}%{_datadir}/gnome-shell/extensions/[email protected] -%endif +%find_lang ibus10 %{?no_lang_C} -%pre -f %{name}.schemas_pre +%post +%glib2_gsettings_schema_post -%post gtk -%gtk2_immodule_post +%posttrans +dconf update -%preun -f %{name}.schemas_preun +%postun +%glib2_gsettings_schema_postun +dconf update -%posttrans -f %{name}.schemas_posttrans +%post gtk +%gtk2_immodule_post %postun gtk %gtk2_immodule_postun -%post -n libibus-1_0-0 -p /sbin/ldconfig +%post -n libibus-1_0-5 -p /sbin/ldconfig -%postun -n libibus-1_0-0 -p /sbin/ldconfig - -%if %{build_gtk3} +%postun -n libibus-1_0-5 -p /sbin/ldconfig %post gtk3 %gtk3_immodule_post %postun gtk3 %gtk3_immodule_postun -%endif -%files -f %{name}.lst +%files %defattr(-,root,root,-) %doc AUTHORS COPYING README %doc $RPM_SOURCE_DIR/xim.ibus.suse.template %doc $RPM_SOURCE_DIR/ibus-README.suse %dir /etc/X11/xim.d %config /etc/X11/xim.d/* -%{python_sitelib}/ibus %dir %{_datadir}/ibus/ +%{_bindir}/ibus %{_bindir}/ibus-daemon %{_bindir}/ibus-setup %{_datadir}/ibus/* %{_datadir}/applications/* +%dir %{_datadir}/GConf +%dir %{_datadir}/GConf/gsettings +%{_datadir}/GConf/gsettings/ibus.convert +%{_datadir}/glib-2.0/schemas/org.freedesktop.ibus.gschema.xml %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/pixmaps/* %{_prefix}/%{_lib}/ibus +%{_datadir}/bash-completion +%config %{_sysconfdir}/dconf/ -%if 0%{suse_version} >= 1230 -%files gnome-shell -%defattr(-,root,root) -%dir %{_datadir}/gnome-shell/ -%dir %{_datadir}/gnome-shell/extensions/ -%dir %{_datadir}/gnome-shell/extensions/[email protected]/ -%{_datadir}/gnome-shell/extensions/[email protected]/* -%endif +%files lang -f ibus10.lang -%files -n libibus-1_0-0 +%files -n libibus-1_0-5 %defattr(-,root,root,-) %{_libdir}/lib*.so.* @@ -286,12 +252,13 @@ %defattr(-,root,root,-) %{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.so -%if %suse_version >= 1140 - %files gtk3 %defattr(-,root,root,-) %{_libdir}/gtk-3.0/3.0.0/immodules/* -%endif + +%files -n python-ibus +%defattr(-,root,root,-) +%{_libdir}/python2.7/site-packages/ibus %files devel %defattr(-,root,root,-) @@ -300,7 +267,6 @@ %{_datadir}/gtk-doc/html/* %{_libdir}/pkgconfig/* %{_datadir}/gir-1.0/IBus-1.0.gir -%dir %{_datadir}/vala -%{_datadir}/vala/* +%{_datadir}/vala/vapi/* %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.V6ajoZ/_old 2013-07-07 22:18:07.000000000 +0200 +++ /var/tmp/diff_new_pack.V6ajoZ/_new 2013-07-07 22:18:07.000000000 +0200 @@ -22,6 +22,6 @@ postun "<prefix>%{_bindir}/gtk-query-immodules-3.0 --update-cache" postun "%endif" supplements "packageand(ibus:gtk3-<targettype>)" -libibus-1_0-0 +libibus-1_0-5 obsoletes "libibus2-<targettype> < <version>" ++++++ ibus-1.4.2.tar.gz -> ibus-1.5.2.tar.gz ++++++ ++++ 259123 lines of diff (skipped) ++++++ ibus-README.suse ++++++ --- /var/tmp/diff_new_pack.V6ajoZ/_old 2013-07-07 22:18:08.000000000 +0200 +++ /var/tmp/diff_new_pack.V6ajoZ/_new 2013-07-07 22:18:08.000000000 +0200 @@ -1,11 +1,6 @@ ibus README for SuSE How to start using ibus -Note: -Since GNOME 3.6 does not support IBus 1.4, IBus's indicator icon is not placed on GNOME panel in the top of screen -by default. This package includes a GNOME shell extension named IBus 1.4 indicator to resolve this problem. -Please enable the extension manually from gnome-tweak-tool GUI if you need the indicator on the panel. - English: 0:Note: ibus don't support QT3 immodule, -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
