Author: phuang
Update of /cvs/pkgs/rpms/ibus/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29801
Modified Files:
ibus.spec
Log Message:
Remove gtk3 subpackage
Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-13/ibus.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -p -r1.114 -r1.115
--- ibus.spec 12 Jun 2010 01:43:59 -0000 1.114
+++ ibus.spec 12 Jun 2010 01:50:16 -0000 1.115
@@ -1,6 +1,5 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?gtk2_binary_version: %define gtk2_binary_version %(pkg-config --variable=gtk_binary_version gtk+-2.0)}
-%{!?gtk3_binary_version: %define gtk3_binary_version %(pkg-config --variable=gtk_binary_version gtk+-3.0)}
%define glib_ver %([ -a %{_libdir}/pkgconfig/glib-2.0.pc ] && pkg-config --modversion glib-2.0 | cut -d. -f 1,2 || echo -n "999")
%define gconf2_version 2.12.0
@@ -26,7 +25,6 @@ BuildRequires: gettext-devel
BuildRequires: libtool
BuildRequires: python
BuildRequires: gtk2-devel
-BuildRequires: gtk3-devel
BuildRequires: dbus-glib-devel
BuildRequires: dbus-python-devel >= %{dbus_python_version}
BuildRequires: desktop-file-utils
@@ -38,7 +36,6 @@ BuildRequires: iso-codes-devel
Requires: %{name}-libs = %{version}-%{release}
Requires: %{name}-gtk2 = %{version}-%{release}
-Requires: %{name}-gtk3 = %{version}-%{release}
Requires: pygtk2
Requires: pyxdg
@@ -81,20 +78,10 @@ Summary: IBus im module for gtk2
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Requires(post): glib2 >= %{glib_ver}
-Obsoletes: ibus-gtk
-Provides: ibus-gtk
%description gtk2
This package contains ibus im module for gtk2
-%package gtk3
-Summary: IBus im module for gtk3
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires(post): glib2 >= %{glib_ver}
-
-%description gtk3
-This package contains ibus im module for gtk3
%package devel
Summary: Development tools for ibus
@@ -125,7 +112,7 @@ The ibus-devel-docs package contains dev
%configure \
--disable-static \
--enable-gtk2 \
- --enable-gtk3 \
+ --disable-gtk3 \
--enable-xim \
--disable-gtk-doc \
--enable-introspection
@@ -138,7 +125,6 @@ rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
rm -f $RPM_BUILD_ROOT%{_libdir}/libibus.la
rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{gtk2_binary_version}/immodules/im-ibus.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{gtk3_binary_version}/immodules/im-ibus.la
# install xinput config file
install -pm 644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_xinputconf}
@@ -196,18 +182,12 @@ fi
%postun libs -p /sbin/ldconfig
-%post gtk2
+%post gtk
%{_bindir}/update-gtk-immodules %{_host}
-%postun gtk2
+%postun gtk
%{_bindir}/update-gtk-immodules %{_host}
-%post gtk3
-%{_bindir}/gtk-query-immodules-3.0-%{__isa_bits} --update-cache
-
-%postun gtk3
-%{_bindir}/gtk-query-immodules-3.0-%{__isa_bits} --update-cache
-
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
@@ -231,14 +211,10 @@ fi
%{_libdir}/libibus.so.*
%{_libdir}/girepository-1.0/IBus-1.0.typelib
-%files gtk2
+%files gtk
%defattr(-,root,root,-)
%{_libdir}/gtk-2.0/%{gtk2_binary_version}/immodules/im-ibus.so
-%files gtk3
-%defattr(-,root,root,-)
-%{_libdir}/gtk-3.0/%{gtk3_binary_version}/immodules/im-ibus.so
-
%files devel
%defattr(-,root,root,-)
%{_libdir}/lib*.so
@@ -254,7 +230,7 @@ fi
%changelog
* Sat Jun 12 2010 Peng Huang <shawn.p.huang at gmail.com> - 1.3.5-1
- Update to 1.3.5
-- Support gtk3, gobject-introspection and vala.
+- Support gobject-introspection and vala.
* Sat May 29 2010 Peng Huang <shawn.p.huang at gmail.com> - 1.3.4-2
- Update to 1.3.4