From b28400f14a0da74e004433eb525abe7bf2e591c0e83519808ca89595ecec7fcb Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 27 Jun 2011 11:34:31 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/ibus revision 11.0 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=84284956d23d555c3feff5d0543592ae --- ibus.spec | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/ibus.spec b/ibus.spec index abe9b32..9c011a5 100644 --- a/ibus.spec +++ b/ibus.spec @@ -70,14 +70,16 @@ Supplements: packageand(ibus:gtk2) This package contains ibus im module for gtk2 %if %suse_version >= 1140 + %package gtk3 -Summary: IBus im module for gtk3 -Group: System/I18n/Chinese -Requires: %{name} = %{version}-%{release} -BuildRequires: gtk3-devel + +Summary: IBus im module for gtk3 +Group: System/I18n/Chinese +Requires: %{name} = %{version}-%{release} +BuildRequires: gtk3-devel %gtk3_immodule_requires Supplements: packageand(ibus:gtk3) - + %description gtk3 This package contains ibus im module for gtk3 %endif @@ -176,9 +178,10 @@ rm -rf %buildroot %postun -n libibus2 -p /sbin/ldconfig %if %suse_version >= 1140 + %post gtk3 %gtk3_immodule_post - + %postun gtk3 %gtk3_immodule_postun %endif @@ -210,6 +213,7 @@ rm -rf %buildroot %{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.so %if %suse_version >= 1140 + %files gtk3 %defattr(-,root,root,-) %{_libdir}/gtk-3.0/3.0.0/immodules/* From fab95ff6f4fb078f127fa6e46e88436aac7421ad9e48ce6df3811c8f0ff14512 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 27 Jun 2011 12:23:04 +0000 Subject: [PATCH 2/2] - dropped the dependencies with release number - simplify for passing gtk3 configure option OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=22 --- ibus.changes | 6 ++++++ ibus.spec | 20 +++++++------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ibus.changes b/ibus.changes index 582593c..5513554 100644 --- a/ibus.changes +++ b/ibus.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 27 14:21:46 CEST 2011 - tiwai@suse.de + +- dropped the dependencies with release number +- simplify for passing gtk3 configure option + ------------------------------------------------------------------- Sun Jun 19 12:43:54 UTC 2011 - swyear@gmail.com diff --git a/ibus.spec b/ibus.spec index 9c011a5..961a6de 100644 --- a/ibus.spec +++ b/ibus.spec @@ -62,7 +62,7 @@ This package contains the libraries for IBus License: LGPL V2+ Summary: IBus im module for gtk2 Group: System/I18n/Chinese -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} %gtk2_immodule_requires Supplements: packageand(ibus:gtk2) @@ -75,7 +75,7 @@ This package contains ibus im module for gtk2 Summary: IBus im module for gtk3 Group: System/I18n/Chinese -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} BuildRequires: gtk3-devel %gtk3_immodule_requires Supplements: packageand(ibus:gtk3) @@ -88,7 +88,7 @@ This package contains ibus im module for gtk3 License: LGPL V2+ Summary: Development tools for ibus Group: Development/Libraries/other -Requires: libibus2 = %{version}-%{release} +Requires: libibus2 = %{version} Requires: glib2-devel Requires: dbus-1-devel Requires: gtk-doc @@ -107,20 +107,14 @@ docs for ibus. %build autoreconf -fi intltoolize -f -%if %suse_version >= 1140 %configure --disable-static \ +%if %suse_version >= 1140 + --enable-gtk3 \ +%endif --disable-iso-codes-check \ --disable-gobject-introspection \ --enable-gtk-doc \ - --libexecdir=%{_prefix}/%{_lib}/ibus \ - --enable-gtk3 -%else -%configure --disable-static \ - --disable-iso-codes-check \ - --disable-gobject-introspection \ - --enable-gtk-doc \ - --libexecdir=%{_prefix}/%{_lib}/ibus -%endif + --libexecdir=%{_prefix}/%{_lib}/ibus make %{?jobs:-j %jobs} %install