rpm/fcitx
SHA256
1
0
Fork 0
forked from pool/fcitx
Code Pull Requests Activity

Accepting request 222319 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/222319
OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=84
This commit is contained in:
Takashi Iwai 2014-02-14 12:02:17 +00:00 committed by Git OBS Bridge
parent a3d181aa12
commit cd9a4a1dd3
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
baselibs.conf
View File

@ -7,14 +7,14 @@ libfcitx-4_2_8
fcitx-gtk2 fcitx-gtk2
requires "libfcitx-4_2_8-<targettype> = <version>" requires "libfcitx-4_2_8-<targettype> = <version>"
post "%if "%_lib" == "lib64"" post "%if "%_lib" == "lib64""
post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > %{_sysconfdir}/gtk-2.0/gtk64.immodules" post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 --update-cache"
post "%else" post "%else"
post "<prefix>%{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules" post "<prefix>%{_bindir}/gtk-query-immodules-2.0 --update-cache"
post "%endif" post "%endif"
postun "%if "%_lib" == "lib64"" postun "%if "%_lib" == "lib64""
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > %{_sysconfdir}/gtk-2.0/gtk64.immodules" postun "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 --update-cache"
postun "%else" postun "%else"
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules" postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 --update-cache"
postun "%endif" postun "%endif"
fcitx-gtk3 fcitx-gtk3
requires "libfcitx-4_2_8-<targettype> = <version>" requires "libfcitx-4_2_8-<targettype> = <version>"

6
fcitx.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)
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Dec 7 04:23:04 UTC 2013 - swyear@gmail.com Sat Dec 7 04:23:04 UTC 2013 - swyear@gmail.com

9
fcitx.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package fcitx # spec file for package fcitx
# #
# 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -368,6 +368,13 @@ You can either use this package for download from kde-look.org using knewstaff i
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
# 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 %build
mkdir build mkdir build