Accepting request 49892 from M17N

Copy from M17N/ibus based on submit request 49892 from user coolo OBS-URL: https://build.opensuse.org/request/show/49892 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ibus?expand=0&rev=4
2010-10-07 20:42:05 +00:00 · 2010-10-07 20:42:05 +00:00 · 67558acc7b
commit 67558acc7b
parent 8f17f26fea
6 changed files with 105 additions and 14 deletions
--- a/ibus-1.2.0.20100111.tar.gz
+++ b/ibus-1.2.0.20100111.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:41f23f1f8bf2746366e2faa57c8bec985098f5770a52c3d56899d33fc5f38384
-size 1291877
--- a/ibus-1.3.6.tar.gz
+++ b/ibus-1.3.6.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:860d834dedf6a70a7872b4849469a3b43667b57c2691fdc02570f5e3acb1b042
+size 1343753
--- a/ibus-disable-introspect.patch
+++ b/ibus-disable-introspect.patch
@ -0,0 +1,35 @@
+diff --git a/configure.ac b/configure.ac
+index ea35a7c..53065fc 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -169,7 +169,20 @@ else
+ fi
+ 
+ # GObject introspection
+-GOBJECT_INTROSPECTION_CHECK([0.6.8])
+
+AC_ARG_ENABLE(gobject-introspection,
+    AS_HELP_STRING([--disable-gobject-introspection],
+                   [Do not use gobject-introspection code]),
+    [enable_gobject_introspection=$enableval],
+    [enable_gobject_introspection=yes]
+)
+AM_CONDITIONAL([HAVE_INTROSPECTION], [test "x$enable_gobject_introspection" = "xyes"])
+
+if test x"$enable_gobject_introspection" = x"yes"; then
+    GOBJECT_INTROSPECTION_CHECK([0.6.8])
+else
+    AM_CONDITIONAL([HAVE_INTROSPECTION], [false])
+fi
+ 
+ # check for gtk-doc
+ GTK_DOC_CHECK(1.9)
+@@ -374,7 +387,7 @@ Build options:
+   Build XIM agent server    $enable_xim
+   Build python modules      $enable_python
+   Build gconf modules       $enable_gconf
+-  Build introspection       $found_introspection
+  Build introspection       $enable_gobject_introspection
+   Build vala binding        $enable_vala
+   Build document            $enable_gtk_doc
+   Enable key snooper        $enable_key_snooper
--- a/ibus-disable-portability-check.patch
+++ b/ibus-disable-portability-check.patch
@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index e446d90..ea35a7c 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -32,7 +32,7 @@ m4_define([ibus_version],
+     ibus_major_version.ibus_minor_version.ibus_micro_version[]ibus_maybe_datestamp)
+ 
+ AC_INIT([ibus], [ibus_version], [http://code.google.com/p/ibus/issues/entry],[ibus])
+-AM_INIT_AUTOMAKE([1.10])
+AM_INIT_AUTOMAKE([1.10 foreign -Wno-portability])
+ AC_GNU_SOURCE
+ 
+ AC_CONFIG_HEADERS([config.h])
--- a/ibus.changes
+++ b/ibus.changes
@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Tue Jul 13 07:44:40 UTC 2010 - mxwu@novell.com
+
+- Add ibus-disable-portability-check.patch
+  * Disable automake's portability check, make OBS happy.
+
+-------------------------------------------------------------------
+Mon Jul 12 08:49:24 UTC 2010 - mxwu@novell.com
+
+- Upgrade to 1.3.6:
+  * Support gtk3
+  * Support gobject-introspection
+  * Support vala language
+  * Fix some bugs
+
+-------------------------------------------------------------------
+Tue May 11 10:00:07 UTC 2010 - mxwu@novell.com
+
+- Upgrade to 1.3.3:
+  * Add configure option to disable key snooper in gtk im context
+  * Fix a crash in ibus-x11
+  * Fix a crash in ibus-daemon
+  * For show language bar option, use {Embedded in menu} to replace {Never}.
+  * Update some translation files
+  * Fix crash if ibus loads engine.xml failed
+  * Fix focus problems
+  * Does not hard code iso-codes location
+  * Fix link problem with binutils-gold
+  * Updated translations
+  * Optimize database query method for better performance
+  * Many bug fixing
+  * use floating IBusObject
+  * support share one global engine in all applications
+  * some ui improvements
+  * many bug fixing
+
 -------------------------------------------------------------------
 Fri Mar 26 17:18:38 CET 2010 - tiwai@suse.de

--- 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.6)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@ -18,7 +18,7 @@


 Name:           ibus
-Version:        1.2.0.20100111
+Version:        1.3.6
 Release:        1
 License:        LGPL V2+
 Url:            http://code.google.com/p/ibus/
@ -27,21 +27,23 @@ Source1:        xim.d-ibus
 Source2:        ibus-README.suse  
 Source3:        xim.ibus.suse.template 
 Patch0:         ibus-python-install-dir.patch
+Patch1:         ibus-disable-portability-check.patch
+Patch2:         ibus-disable-introspect.patch
 Group:          System/I18n/Chinese
 Summary:        Intelligent Input Bus for Linux OS
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         /usr/bin/touch
 #Provides:       locale(ja;ko;zh)
-Recommends:     ibus-gtk ibus-qt
+#Recommends:     ibus-gtk ibus-qt

 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
+BuildRequires:  fdupes gobject-introspection-devel intltool iso-codes-devel
 %if %suse_version >= 1100
 BuildRequires:  pcre-devel
 %endif
-Requires:       glib2 python-gtk dbus-1-python notification-daemon iso-codes gconf2 python-xdg python-notify
+Requires:       glib2 python-gtk dbus-1-python notification-daemon iso-codes gconf2 python-xdg python-notify gobject-introspection
 %gconf_schemas_prereq

 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
@ -52,12 +54,12 @@ IBus means Intelligent Input Bus. It is a new input framework for Linux OS. It p
 full featured and user friendly input method user interface. It also may help
 developers to develop input method easily.

-%package -n libibus1
+%package -n libibus2
 License:        LGPL V2+
 Summary:        IBus libraries
 Group:          System Environment/Libraries

-%description -n libibus1
+%description -n libibus2
 This package contains the libraries for IBus

 %package gtk
@ -73,7 +75,7 @@ This package contains ibus im module for gtk2
 License:        LGPL V2+
 Summary:        Development tools for ibus
 Group:          Development/Libraries
-Requires:       libibus1 = %{version}-%{release}
+Requires:       libibus2 = %{version}-%{release}
 Requires:       glib2-devel
 Requires:       dbus-1-devel
 Requires:       gtk-doc
@ -86,12 +88,15 @@ docs for ibus.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1

 %build
 autoreconf -fi
 intltoolize -f
 %configure --disable-static \
 		   --disable-iso-codes-check \
+                   --disable-gobject-introspection \
 		   --enable-gtk-doc \
 		   --disable-qt4-immodule \
 	           --libexecdir=%{_prefix}/%{_lib}/ibus
@ -145,9 +150,9 @@ touch var/adm/SuSEconfig/run-gtk
 touch var/adm/SuSEconfig/run-gtk
 /sbin/SuSEconfig --module gtk2

-%post -n libibus1 -p /sbin/ldconfig
+%post -n libibus2 -p /sbin/ldconfig

-%postun -n libibus1 -p /sbin/ldconfig
+%postun -n libibus2 -p /sbin/ldconfig

 %files -f %{name}.lst
 %defattr(-,root,root,-)
@ -165,8 +170,10 @@ touch var/adm/SuSEconfig/run-gtk
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/pixmaps/*
 %{_prefix}/%{_lib}/ibus
+%dir %{_datadir}/vala
+%{_datadir}/vala/*

-%files -n libibus1
+%files -n libibus2
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so.*