ibus: re-enable compat32, fix Requires

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4691 ec354946-7b23-47d6-9f5a-488ba84defc7

i/ibus/ibus-vl.spec

@@ -1,6 +1,8 @@
+%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
+
 %define snapshot 20110817
 %define	ver 1.3.99.%{snapshot}
-%define	rel 1
+%define	rel 2
 
 %if "%{?_dist_release}" >= "vl7"
 %define have_gjsfile 1
@@ -82,7 +84,8 @@ Summary: IBus im module for gtk3
 Summary(ja): gtk3 用 IBus IMモジュール
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires(post):	glib2
+Requires(post):	gtk3
+Requires(preun): gtk3
 
 %description gtk3
 The ibus-gtk3 contains ibus im module for gtk3.
@@ -100,6 +103,31 @@ GUI for GNOME3 in development.  Note that this package will be marked
 as obsolete once the integration has completed in the GNOME3 upstream.
 
 
+## to build compat32 for x86_64 architecture support
+%package -n compat32-%{name}
+Summary:        IBus im module for gtk2
+Summary(ja):    IBus gtk2 用 IM モジュール
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires(post): compat32-gtk2
+Requires(preun): compat32-gtk2
+
+%description -n compat32-%{name}
+The compat32-ibus contains ibus im module for gtk2.
+
+%if %{?_dist_release} != "vl5"
+%package -n compat32-%{name}-gtk3
+Summary: Ibus im module for gtk3
+Group: System Environment/Libraries
+Requires: compat32-%{name} = %{version}-%{release}
+Requires(post): compat32-gtk3
+Requires(preun): compat32-gtk3
+
+%description -n compat32-%{name}-gtk3
+The compat32-ibus-gtk3 contains ibus im module for gtk3.
+
+%endif
+
 %prep
 %setup -q
 %if %have_gjsfile
@@ -223,14 +251,26 @@ touch --no-create %{_datadir}/icons/hicolor || :
 [ -x %{_bindir}/gtk-update-icon-cache ] && \
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
-%if %{?_dist_release} != "vl5"
 %post gtk3
 %{_bindir}/gtk-query-immodules-3.0 --update-cache
 
 %postun gtk3
 %{_bindir}/gtk-query-immodules-3.0 --update-cache
 
-%endif
+%post -n compat32-%{name}
+/sbin/ldconfig
+%{_bindir}/gtk-query-immodules-2.0-32 > %{_sysconfdir}/gtk-2.0/i386/gtk.immodules
+
+%postun -n compat32-%{name}
+/sbin/ldconfig
+%{_bindir}/gtk-query-immodules-2.0-32 > %{_sysconfdir}/gtk-2.0/i386/gtk.immodules
+
+%post -n compat32-%{name}-gtk3
+%{_bindir}/gtk-query-immodules-3.0-32 --update-cache
+
+%postun -n compat32-%{name}-gtk3
+%{_bindir}/gtk-query-immodules-3.0-32 --update-cache
+
 
 %files -f %{name}10.lang
 %defattr(-,root,root,-)
@@ -279,7 +319,28 @@ touch --no-create %{_datadir}/icons/hicolor || :
 %{_datadir}/gnome-shell/extensions/ibus-indicator@example.com
 %endif
 
+## to build compat32 for x86_64 architecture support
+%if %{build_compat32}
+%files -n compat32-%{name}
+%defattr(-,root,root)
+%{_libdir}/libibus-%{ibus_api_version}.so.*
+%{_libdir}/gtk-2.0/immodules/im-ibus.so
+
+%if %{?_dist_release} != "vl5"
+%files -n compat32-%{name}-gtk3
+%defattr(-,root,root,-)
+%{_libdir}/gtk-3.0/3.0.0/immodules/im-ibus.so
+%endif
+%endif
+
 %changelog
+* Wed Aug 31 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.3.99.20110817-2
+- re-enable compat32
+  * Wed Aug 10 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.3.9-6
+  - add compat32-ibus{,-gtk3}
+- add %%post/preun gtk3 to ibus-gtk3
+- add %%post/preun compat32-gtk3 to compat32-ibus-gtk3
+
 * Tue Aug 23 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 1.3.99.20110817-1
 - update to upstream snapshot (1.3.99.20110817)
 - add ibus-gjs for gnome3