pool/ibus
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 222322 from home:tiwai:branches:M17N

Browse Source 
- Fix *-32bit post and postun calls for gtk-query-immodules-2 on
  openSUSE 13.1 and later (bnc#845860)

OBS-URL: https://build.opensuse.org/request/show/222322
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=95
This commit is contained in:
Takashi Iwai 2014-02-14 12:02:34 +00:00 committed by Git OBS Bridge
parent 3684c3ba3e
commit d0e67297d5
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
baselibs.conf
View File

@ -1,13 +1,13 @@
ibus-gtk
post "%if "%_lib" == "lib64""
post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules"
post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 --update-cache"
post "%else"
post "<prefix>%{_bindir}/gtk-query-immodules-2.0 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules"
post "<prefix>%{_bindir}/gtk-query-immodules-2.0 --update-cache"
post "%endif"
postun "%if "%_lib" == "lib64""
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules"
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 --update-cache"
postun "%else"
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules"
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 --update-cache"
postun "%endif"
supplements "packageand(ibus:gtk2-<targettype>)"
ibus-gtk3

6
ibus.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Feb 14 12:10:13 CET 2014 - tiwai@suse.de
- Fix *-32bit post and postun calls for gtk-query-immodules-2 on
openSUSE 13.1 and later (bnc#845860)
-------------------------------------------------------------------
Mon Feb 10 09:48:56 UTC 2014 - fcrozat@suse.com

7
ibus.spec
View File

@ -178,6 +178,13 @@ docs for ibus.
%prep
%setup -q
%patch0 -p1
# hack to fix incompatibility of gtk-query-immodules-2.0 (bnc#845860)
%if %suse_version < 1310
sed -i \
-e's@\(gtk-query-immodules-2.0-64\) --update-cache@\1 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules@g' \
-e's@\(gtk-query-immodules-2.0\) --update-cache@\1 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules@g' \
$RPM_SOURCE_DIR/baselibs.conf
%endif
%if %{with_automatic_config}
%patch1 -p1