Accepting request 222326 from M17N

- Fix *-32bit post and postun calls for gtk-query-immodules-2 on
  openSUSE 13.1 and later (bnc#845860) (forwarded request 222321 from tiwai)

OBS-URL: https://build.opensuse.org/request/show/222326
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/uim?expand=0&rev=44
This commit is contained in:
Stephan Kulow 2014-02-15 07:07:37 +00:00 committed by Git OBS Bridge
commit a1b3bf0a45
3 changed files with 18 additions and 5 deletions

View File

@ -4,14 +4,14 @@ uim
recommends "uim-qt4-<targettype> = <version>"
uim-gtk2
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"
requires "uim-<targettype> = <version>"
supplements "packageand(uim:gtk2-<targettype>)"

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)
-------------------------------------------------------------------
Sat Aug 24 04:37:14 UTC 2013 - ftake@geeko.jp

View File

@ -1,7 +1,7 @@
#
# spec file for package uim
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -136,6 +136,13 @@ Qt4 input module plugin for uim
%patch4 -p1
cp emacs/README README.emacs
iconv -f euc-jp -t utf-8 < emacs/README.ja > README.ja.emacs
# 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
%build
%configure --disable-static --with-pic \