Hello community, here is the log from the commit of package ibus for openSUSE:Factory checked in at 2014-08-05 10:24:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-07-29 16:47:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ibus.new/ibus.changes 2014-08-05 10:24:14.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Jul 31 12:07:24 UTC 2014 - [email protected] + +- remove patches merged by upstream + * add-libgnomekbd-and-load-preload-engines.patch + * reload-preload-engines-until-users-customize-the-list.patch +- obsoletes python-ibus when packaged for Python 3 + +------------------------------------------------------------------- Old: ---- add-libgnomekbd-and-load-preload-engines.patch reload-preload-engines-until-users-customize-the-list.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus.spec ++++++ --- /var/tmp/diff_new_pack.fBBAMz/_old 2014-08-05 10:24:16.000000000 +0200 +++ /var/tmp/diff_new_pack.fBBAMz/_new 2014-08-05 10:24:16.000000000 +0200 @@ -16,7 +16,6 @@ # -%define with_automatic_config 1 %define gtk_binary_version %(pkg-config --variable=gtk_binary_version gtk+-2.0) %define with_python3 1 %if 0%{?suse_version} >= 1310 @@ -43,14 +42,6 @@ Source99: baselibs.conf # PATCH-FIX-OPENSUSE ibus-python-install-dir.patch [email protected] Patch0: ibus-python-install-dir.patch - -%if %{with_automatic_config} -# PATCH-FEATURE-UPSTREAM add-libgnomekbd-and-load-preload-engines.patch Issue 1641 [email protected] -Patch1: add-libgnomekbd-and-load-preload-engines.patch -# PATCH-FEATURE-UPSTREAM reload-preload-engines-until-users-customize-the-list.patch Issue 1641 [email protected] -Patch2: reload-preload-engines-until-users-customize-the-list.patch -%endif - # PATCH-FIX-OPENSUSE reload-preload-engines-until-users-customize-the-list.patch [email protected] Patch3: show-input-mode-icon.patch # PATFH-FIX-SUSE ibus-xim-fix-re-focus-after-lock.patch bnc#874869 [email protected] -- Fix lost XIM input after screenlock @@ -66,10 +57,6 @@ Patch6: ibus-vala-0.18.patch BuildRequires: dbus-1-glib-devel BuildRequires: dbus-1-python-devel >= 0.83.0 -%if %{with_automatic_config} -BuildRequires: dbus-1-x11 -BuildRequires: libgnomekbd-devel -%endif BuildRequires: dconf-devel >= 0.7.5 BuildRequires: fdupes BuildRequires: gconf2-devel @@ -121,6 +108,9 @@ Provides: locale(ja;ko;zh) Obsoletes: ibus-gnome-shell Obsoletes: libibus-1_0-0 +%if %{with_python3} +Obsoletes: python-ibus +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -229,13 +219,6 @@ %{SOURCE99} %endif -%if %{with_automatic_config} -#%patch1 -p1 -#%patch2 -p1 -rm -f bindings/vala/ibus-1.0.vapi -rm -f data/dconf/00-upstream-settings -%endif - %patch3 -p1 %patch4 -p1 @@ -263,16 +246,9 @@ %if %{with_wayland} --enable-wayland \ %endif -%if %{with_automatic_config} - --enable-libgnomekbd \ -%endif --enable-surrounding-text \ --libexecdir=%{_libdir}/ibus -%if %{with_automatic_config} -make -C ui/gtk3 maintainer-clean-generic %{?_smp_mflags} -%endif - make %{?_smp_mflags} %install -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
