rpms/ibus/F-12 .cvsignore, 1.54, 1.55 ibus-HEAD.patch, 1.29, 1.30 ibus.spec, 1.110, 1.111 sources, 1.63, 1.64

Tue Jul 6 10:37:24 UTC 2010

Author: fujiwara

Update of /cvs/pkgs/rpms/ibus/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8434

Modified Files:
	.cvsignore ibus-HEAD.patch ibus.spec sources 
Log Message:

Update to 1.3.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-12/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55

--- .cvsignore	28 May 2010 22:52:54 -0000	1.54
+++ .cvsignore	6 Jul 2010 10:37:23 -0000	1.55
@@ -1 +1 @@
-ibus-1.3.4.tar.gz
+ibus-1.3.6.tar.gz

ibus-HEAD.patch:
 languagebar.py |    3 +++
 menu.py        |    5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

Index: ibus-HEAD.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-12/ibus-HEAD.patch,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- ibus-HEAD.patch	4 May 2010 05:52:39 -0000	1.29
+++ ibus-HEAD.patch	6 Jul 2010 10:37:23 -0000	1.30
@@ -1 +1,52 @@
+commit 674bc53c30c8ac40e021da660f2af533ab015587
+Author: Daiki Ueno <ueno at unixuser.org>
+Date:   Wed Jun 30 12:05:32 2010 +0900
 
+    Fix "Show language panel: Embedded in menu" behavior.
+    
+    Signed-off-by: Daiki Ueno <ueno at unixuser.org>
+
+diff --git a/ui/gtk/languagebar.py b/ui/gtk/languagebar.py
+index f22080f..2fc1cb7 100644
+--- a/ui/gtk/languagebar.py
++++ b/ui/gtk/languagebar.py
+@@ -29,6 +29,7 @@ from handle import Handle
+ from menu import menu_position,\
+     ImageMenuItem,\
+     Menu,\
++    CheckMenuItem,\
+     RadioMenuItem,\
+     SeparatorMenuItem
+ from engineabout import EngineAbout
+@@ -378,6 +379,8 @@ class LanguageBar(gtk.Toolbar):
+                 item = ImageMenuItem(prop = prop)
+                 self.__set_item_icon(item, prop)
+             elif prop.type == ibus.PROP_TYPE_TOGGLE:
++                item = CheckMenuItem(prop = prop)
++            elif prop.type == ibus.PROP_TYPE_RADIO:
+                 item = RadioMenuItem(radio_group, prop = prop)
+                 radio_group = item
+             elif prop.type == ibus.PROP_TYPE_SEPARATOR:
+diff --git a/ui/gtk/menu.py b/ui/gtk/menu.py
+index b9a6b44..53fa39f 100644
+--- a/ui/gtk/menu.py
++++ b/ui/gtk/menu.py
+@@ -59,7 +59,7 @@ class Menu(gtk.Menu, PropItem):
+                 item = SeparatorMenuItem()
+                 radio_group = None
+             elif prop.type == ibus.PROP_TYPE_MENU:
+-                item = gtk.ImageMenuItem()
++                item = ImageMenuItem(prop)
+                 if prop.icon:
+                     size = gtk.icon_size_lookup(gtk.ICON_SIZE_MENU)
+                     item.set_image(icon.IconWidget(prop.icon, size[0]))
+@@ -238,6 +238,9 @@ class SeparatorMenuItem(gtk.SeparatorMenuItem, PropItem):
+        (gobject.TYPE_STRING, gobject.TYPE_INT)),
+     }
+ 
++    def __init__(self):
++        gtk.SeparatorMenuItem.__init__(self)
++        PropItem.__init__(self, None)
+ 
+ 
+ def menu_position(menu, button):


Index: ibus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-12/ibus.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- ibus.spec	28 May 2010 23:48:51 -0000	1.110
+++ ibus.spec	6 Jul 2010 10:37:24 -0000	1.111
@@ -1,21 +1,28 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?gtk_binary_version: %define gtk_binary_version %(pkg-config  --variable=gtk_binary_version gtk+-2.0)}
+%{!?gtk2_binary_version: %define gtk2_binary_version %(pkg-config  --variable=gtk_binary_version gtk+-2.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
 %define dbus_python_version 0.83.0
 %define im_chooser_version 1.2.5
 
+# 0.6.8 is required but f12 has 0.6.5
+%if 0%{?fedora} > 12
+%define have_gobject_introspection 1
+%else
+%define have_gobject_introspection 0
+%endif
+
 Name:       ibus
-Version:    1.3.4
-Release:    2%{?dist}
+Version:    1.3.6
+Release:    1%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:    xinput-ibus
-# Patch0:     ibus-HEAD.patch
+Patch0:     ibus-HEAD.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -82,6 +89,7 @@ Requires(post): glib2 >= %{glib_ver}
 %description gtk
 This package contains ibus im module for gtk2
 
+
 %package devel
 Summary:    Development tools for ibus
 Group:      Development/Libraries
@@ -97,7 +105,6 @@ docs for ibus.
 Summary:    Developer documents for ibus
 Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
-Requires:   gtk-doc
 
 %description devel-docs
 The ibus-devel-docs package contains developer documentation for ibus
@@ -105,11 +112,21 @@ The ibus-devel-docs package contains dev
 
 %prep
 %setup -q
-# %patch0 -p1
+%patch0 -p1
 
 %build
-%configure --disable-static \
-           --enable-gtk-doc
+%configure \
+    --disable-static \
+    --enable-gtk2 \
+    --disable-gtk3 \
+    --enable-xim \
+    --disable-gtk-doc \
+%if %have_gobject_introspection
+    --enable-introspection
+%else
+    --disable-introspection
+%endif
+
 # make -C po update-gmo
 make %{?_smp_mflags}
 
@@ -117,7 +134,7 @@ make %{?_smp_mflags}
 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/%{gtk_binary_version}/immodules/im-ibus.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{gtk2_binary_version}/immodules/im-ibus.la
 
 # install xinput config file
 install -pm 644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_xinputconf}
@@ -176,10 +193,10 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %post gtk
-%{_bindir}/update-gtk-immodules %{_host} || :
+%{_bindir}/update-gtk-immodules %{_host}
 
 %postun gtk
-%{_bindir}/update-gtk-immodules %{_host} || :
+%{_bindir}/update-gtk-immodules %{_host}
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -202,22 +219,36 @@ fi
 %files libs
 %defattr(-,root,root,-)
 %{_libdir}/libibus.so.*
+%if %have_gobject_introspection
+%{_libdir}/girepository-1.0/IBus-1.0.typelib
+%endif
 
 %files gtk
 %defattr(-,root,root,-)
-%{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.so
+%{_libdir}/gtk-2.0/%{gtk2_binary_version}/immodules/im-ibus.so
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so
-%{_includedir}/*
 %{_libdir}/pkgconfig/*
+%{_includedir}/*
+%if %have_gobject_introspection
+%{_datadir}/gir-1.0/IBus-1.0.gir
+%endif
+%{_datadir}/vala/vapi/ibus-1.0.vapi
 
 %files devel-docs
 %defattr(-,root,root,-)
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Jul 06 2010 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 1.3.6-1
+- Update to 1.3.6
+
+* Sat Jun 12 2010 Peng Huang <shawn.p.huang at gmail.com> - 1.3.5-1
+- Update to 1.3.5
+- Support vala.
+
 * Sat May 29 2010 Peng Huang <shawn.p.huang at gmail.com> - 1.3.4-2
 - Update to 1.3.4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ibus/F-12/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- sources	28 May 2010 23:48:51 -0000	1.63
+++ sources	6 Jul 2010 10:37:24 -0000	1.64
@@ -1 +1 @@
-721cb3d36c1125c8d88982f2ca301022  ibus-1.3.4.tar.gz
+8380b51bcf53220dff947a1deb33fd95  ibus-1.3.6.tar.gz

