Accepting request 108306 from home:hillwood:branches:M17N

update to 1.4.1

OBS-URL: https://build.opensuse.org/request/show/108306
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=37

ibus-1.4.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9e5a17d910eae932dd0cd185d0a102b56ad4a2bf79d54b1e53f70174cd2c2a3f
-size 1452055

ibus-1.4.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2f46de279ef3c0a48d3f52061794cfc6544ad8cfe3f04d9d12b251d119a180d6
+size 1479412

ibus-src-Makefile.am.diff

@@ -0,0 +1,12 @@
+diff -Nur ibus-1.4.1/src/Makefile.am ibus-1.4.1-new/src/Makefile.am
+--- ibus-1.4.1/src/Makefile.am	2012-02-02 12:54:54.000000000 +0800
++++ ibus-1.4.1-new/src/Makefile.am	2012-03-07 17:30:53.227329124 +0800
+@@ -170,7 +170,7 @@
+     ibusenumtypes.h             \
+     $(NULL)
+ IBus-1.0.gir: $(libibus) Makefile
+-IBus_1_0_gir_SCANNERFLAGS = --pkg=ibus-1.0 $(IBUS_GIR_SCANNERFLAGS)
++IBus_1_0_gir_SCANNERFLAGS = --pkg-export=ibus-1.0 
+ IBus_1_0_gir_INCLUDES = GLib-2.0 GObject-2.0 Gio-2.0
+ IBus_1_0_gir_LIBS = $(libibus)
+ IBus_1_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_files))

ibus.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Mar 07 12:27:57 UTC+8 2012 - hillwood@linuxfans.org
+
+- Update to 1.4.1
+   * Many bug fixings
+- Fix several RPMLINT report warnings
+
 -------------------------------------------------------------------
 Sun Feb 12 17:29:16 UTC 2012 - ftake@geeko.jp
 

ibus.spec

@@ -21,7 +21,7 @@
 %define domain_name %{name}10
 
 Name:           ibus
-Version:        1.4.0
+Version:        1.4.1
 Release:        0
 Url:            http://code.google.com/p/ibus/
 Source0:        http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
@@ -31,13 +31,15 @@ Source3:        xim.ibus.suse.template
 Source4:        xim.d-ibus-121
 Patch0:         ibus-python-install-dir.patch
 Patch1:         ibus-fix-default-preload-engines.patch
+Patch2:         ibus-src-Makefile.am.diff
 Summary:        Intelligent Input Bus for Linux OS
 License:        LGPL-2.1+
 Group:          System/I18n/Chinese
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         /usr/bin/touch
 Provides:       locale(ja;ko;zh)
-
+BuildRequires:  pkg-config
+BuildRequires:  dbus-1-glib-devel
 BuildRequires:  dbus-1-python-devel
 BuildRequires:  fdupes
 BuildRequires:  gconf2-devel
@@ -110,6 +112,10 @@ Requires:       typelib-1_0-IBus-1_0 = %{version}
 Requires:       glib2-devel
 Requires:       dbus-1-devel
 Requires:       gtk-doc
+Requires:       ibus = %{version}
+Requires:       ibus-libs = %{version}
+Requires:       libibus = %{version}
+
 
 %description devel
 The ibus-devel package contains the header files and developer
@@ -120,6 +126,7 @@ docs for ibus.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 autoreconf -fi