From 273f045f785d202115194cd821c2f68bd02f83dec558eb4868dae10f7e6a0980 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 9 Mar 2011 14:26:02 +0000 Subject: [PATCH] Accepting request 63738 from home:tiwai:branches:M17N ok OBS-URL: https://build.opensuse.org/request/show/63738 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=12 --- ibus.changes | 5 +++++ ibus.spec | 11 +++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ibus.changes b/ibus.changes index 96733d5..70b106e 100644 --- a/ibus.changes +++ b/ibus.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 9 11:58:08 CET 2011 - tiwai@suse.de + +- Fix post scripts to use new gtk2_immodule_* macros (bnc#678080) + ------------------------------------------------------------------- Wed Nov 17 08:44:04 UTC 2010 - mxwu@novell.com diff --git a/ibus.spec b/ibus.spec index 521de6b..677992f 100644 --- a/ibus.spec +++ b/ibus.spec @@ -1,5 +1,5 @@ # -# spec file for package ibus (Version 1.2.0.20100111) +# spec file for package ibus (Version 1.3.8) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -39,7 +39,7 @@ PreReq: /usr/bin/touch BuildRequires: gettext-devel gtk-doc libtool python BuildRequires: dbus-1-devel dbus-1-glib-devel dbus-1-python-devel gtk2-devel BuildRequires: gconf2-devel python-gobject2-devel update-desktop-files -BuildRequires: fdupes intltool iso-codes-devel gobject-introspection-devel +BuildRequires: fdupes gobject-introspection-devel intltool iso-codes-devel %if %suse_version >= 1100 BuildRequires: pcre-devel %endif @@ -67,6 +67,7 @@ License: LGPL V2+ Summary: IBus im module for gtk2 Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} +%gtk2_immodule_requires %description gtk This package contains ibus im module for gtk2 @@ -139,16 +140,14 @@ rm -rf %buildroot %pre -f %{name}.schemas_pre %post gtk -touch var/adm/SuSEconfig/run-gtk -/sbin/SuSEconfig --module gtk2 +%gtk2_immodule_post %preun -f %{name}.schemas_preun %posttrans -f %{name}.schemas_posttrans %postun gtk -touch var/adm/SuSEconfig/run-gtk -/sbin/SuSEconfig --module gtk2 +%gtk2_immodule_postun %post -n libibus2 -p /sbin/ldconfig