Accepting request 558840 from M17N

OBS-URL: https://build.opensuse.org/request/show/558840
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ibus?expand=0&rev=80

ibus.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Dec 19 14:50:21 UTC 2017 - ftake@geeko.jp
+
+- Fix boo#1073524: IBus does not work on Qt5 applicatin under
+  Qt5 only environment
+  * do not set QT_IM_MODULE=xim for Qt5 applications
+  * use QT4_IM_MODULE for Qt4 applications
+
+-------------------------------------------------------------------
+Sun Nov 19 13:56:06 UTC 2017 - hillwood@opensuse.org
+
+- Enable emoji support for openSUSE.
+- Use %fdupes in python3-ibus.
+
 -------------------------------------------------------------------
 Sat Nov  4 08:34:08 UTC 2017 - hillwood@opensuse.org
 

ibus.spec

@@ -22,9 +22,11 @@
 %if 0%{?is_opensuse}
 %define with_wayland 1
 %define with_kde 1
+%define with_emoji 1
 %else
 %define with_wayland 0
 %define with_kde 0
+%define with_emoji 0
 %endif
 
 Name:           ibus
@@ -118,6 +120,11 @@ BuildRequires:  pkgconfig(vapigen)
 %if %{with_wayland}
 BuildRequires:  pkgconfig(wayland-client) >= 1.2.0
 %endif
+%if %{with_emoji}
+BuildRequires:  nodejs-emojione
+BuildRequires:  unicode-emoji
+BuildRequires:  pkgconfig(cldr-emoji-annotation)
+%endif
 BuildRequires:  pkgconfig(xkbcommon)
 # copy_deep method is supported since 0.31.1
 BuildRequires:  vala >= 0.31.1
@@ -286,7 +293,11 @@ intltoolize -f
 %configure --disable-static \
            --enable-gtk3 \
            --enable-vala \
+%if %{with_emoji}
+           --enable-emoji-dict \
+%else
            --disable-emoji-dict \
+%endif
 %if %{with_python3}
            --with-python=python3 \
 %endif
@@ -418,12 +429,15 @@ dconf update
 %ghost %{_sysconfdir}/dconf/db/ibus
 %dir %{_sysconfdir}/dconf/db/ibus.d
 # This file is not a config file. Users may not modify it.
-%{_sysconfdir}/dconf/db/ibus.d/00-upstream-settings
-%{_sysconfdir}/dconf/profile/ibus
+%config %{_sysconfdir}/dconf/db/ibus.d/00-upstream-settings
+%config %{_sysconfdir}/dconf/profile/ibus
 %{_sysconfdir}/xdg/autostart/ibus-autostart.desktop
 %{_mandir}/man1/ibus.1.gz
 %{_mandir}/man1/ibus-daemon.1.gz
 %{_mandir}/man1/ibus-setup.1.gz
+%if %{with_emoji}
+%{_mandir}/man7/ibus-emoji.7.gz
+%endif
 
 %files lang -f ibus10.lang
 %defattr(-,root,root)

python3-ibus.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Nov 19 13:56:06 UTC 2017 - hillwood@opensuse.org
+
+- Enable emoji support for openSUSE.
+- Use %fdupes in python3-ibus.
+
 -------------------------------------------------------------------
 Sat Nov  4 08:34:08 UTC 2017 - hillwood@opensuse.org
 

python3-ibus.spec

@@ -104,12 +104,14 @@ make %{?_smp_mflags}
 %install
 make DESTDIR=%{buildroot} install -j1
 
-#remove nessary files
+#remove needless files
 rm -rf %{buildroot}%{_bindir} %{buildroot}%{_datadir} %{buildroot}%{_libdir}/ibus \
        %{buildroot}%{_libdir}/gtk-* %{buildroot}%{_sysconfdir} %{buildroot}%{_includedir} \
        %{buildroot}%{_libdir}/libibus* %{buildroot}%{_libdir}/pkgconfig \
        %{buildroot}%{_libdir}/girepository-1.0
 
+%fdupes %{buildroot}%{python3_sitearch}
+
 %files
 %defattr(-,root,root)
 %{python3_sitearch}/ibus

xim.d-ibus-121

@@ -46,10 +46,13 @@ export LC_CTYPE=$LANG
 export XMODIFIERS="@im=ibus"
 export GTK_IM_MODULE=ibus
 export QT_IM_SWITCHER=imsw-multi
+# Qt5
+export QT_IM_MODULE=ibus
+# Qt4
 if [ -e /usr/$SYS_LIB/qt4/plugins/inputmethods/libqtim-ibus.so ]; then
-    export QT_IM_MODULE=ibus
+    export QT4_IM_MODULE=ibus
 else
-    export QT_IM_MODULE=xim
+    export QT4_IM_MODULE=xim
 fi
 
 case "$WINDOWMANAGER" in