From 49463435472dc59cdaa13e842360fb19d5140a7b9946637483da51616c22ec5d Mon Sep 17 00:00:00 2001 From: Fuminobu Takeyama Date: Wed, 12 Oct 2011 09:32:18 +0000 Subject: [PATCH 1/3] Accepting request 87484 from home:ftake:branches:M17N Upstream update to 1.4.0 libibus2 is renamed. OBS-URL: https://build.opensuse.org/request/show/87484 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=28 --- baselibs.conf | 2 +- ibus-1.3.9.tar.gz | 3 --- ibus-1.4.0.tar.gz | 3 +++ ibus-disable-introspect.patch | 35 ---------------------------- ibus-disable-portability-check.patch | 13 ----------- ibus.spec | 26 ++++++++++----------- 6 files changed, 17 insertions(+), 65 deletions(-) delete mode 100644 ibus-1.3.9.tar.gz create mode 100644 ibus-1.4.0.tar.gz delete mode 100644 ibus-disable-introspect.patch delete mode 100644 ibus-disable-portability-check.patch diff --git a/baselibs.conf b/baselibs.conf index ac38139..f80d939 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -22,4 +22,4 @@ ibus-gtk3 postun "%{_bindir}/gtk-query-immodules-3.0 --update-cache" postun "%endif" supplements "packageand(ibus:gtk3-)" -libibus2 +libibus-1_0-0 diff --git a/ibus-1.3.9.tar.gz b/ibus-1.3.9.tar.gz deleted file mode 100644 index 7ba1ad3..0000000 --- a/ibus-1.3.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b2784a668666efa8ae04e6f1cff5749917cd18add0a39a1d020ecc9f3df5285d -size 1380081 diff --git a/ibus-1.4.0.tar.gz b/ibus-1.4.0.tar.gz new file mode 100644 index 0000000..5023535 --- /dev/null +++ b/ibus-1.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e5a17d910eae932dd0cd185d0a102b56ad4a2bf79d54b1e53f70174cd2c2a3f +size 1452055 diff --git a/ibus-disable-introspect.patch b/ibus-disable-introspect.patch deleted file mode 100644 index fd6eca3..0000000 --- a/ibus-disable-introspect.patch +++ /dev/null @@ -1,35 +0,0 @@ -Index: ibus-1.3.8/configure.ac -=================================================================== ---- ibus-1.3.8.orig/configure.ac -+++ ibus-1.3.8/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 - - IBUS_GIR_SCANNERFLAGS= - if test x"$found_introspection" = x"yes" ; then -@@ -397,7 +410,7 @@ Build options: - Build python modules $enable_python - Build gconf modules $enable_gconf - Build memconf modules $enable_memconf -- Build introspection $found_introspection -+ Build introspection $enable_gobject_introspection - IBus-1.0.gir scannerflags "$IBUS_GIR_SCANNERFLAGS" - Build vala binding $enable_vala - Build document $enable_gtk_doc diff --git a/ibus-disable-portability-check.patch b/ibus-disable-portability-check.patch deleted file mode 100644 index d174287..0000000 --- a/ibus-disable-portability-check.patch +++ /dev/null @@ -1,13 +0,0 @@ -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]) diff --git a/ibus.spec b/ibus.spec index 170f467..e02beb7 100644 --- a/ibus.spec +++ b/ibus.spec @@ -18,9 +18,10 @@ %define build_gtk3 (0%{suse_version} >= 1140) %define build_without_dbus_autolaunch (0%{suse_version} >= 1210) +%define domain_name %{name}10 Name: ibus -Version: 1.3.9 +Version: 1.4.0 Release: 5 License: LGPL V2+ Url: http://code.google.com/p/ibus/ @@ -30,8 +31,6 @@ Source2: ibus-README.suse Source3: xim.ibus.suse.template Source4: xim.d-ibus-121 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 @@ -53,12 +52,13 @@ 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 libibus2 +%package -n libibus-1_0-0 License: LGPL V2+ Summary: IBus libraries Group: System/I18n/Chinese +Obsoletes: libibus2 < %{version} -%description -n libibus2 +%description -n libibus-1_0-0 This package contains the libraries for IBus %package gtk @@ -90,8 +90,8 @@ This package contains ibus im module for gtk3 %package devel License: LGPL V2+ Summary: Development tools for ibus -Group: Development/Libraries/other -Requires: libibus2 = %{version} +Group: Development/Libraries/Other +Requires: libibus-1_0-0 = %{version} Requires: glib2-devel Requires: dbus-1-devel Requires: gtk-doc @@ -144,7 +144,7 @@ pushd $RPM_BUILD_ROOT/etc/X11/xim.d/ popd rm -f $RPM_BUILD_ROOT/%{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ibus.*a -rm -f $RPM_BUILD_ROOT/%{_libdir}/libibus.*a +rm -f $RPM_BUILD_ROOT/%{_libdir}/libibus-*.*a rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/ibus.desktop @@ -154,9 +154,9 @@ ln -sf %{_datadir}/icons/hicolor/48x48/apps/ibus-keyboard.png \ %suse_update_desktop_file %name Utility DesktopUtility %suse_update_desktop_file ibus-setup System SystemSetup -%find_lang %{name} +%find_lang %{domain_name} %find_gconf_schemas -cat %{name}.schemas_list %{name}.lang > %{name}.lst +cat %{name}.schemas_list %{domain_name}.lang > %{name}.lst %fdupes -s $RPM_BUILD_ROOT %clean @@ -174,9 +174,9 @@ rm -rf %buildroot %postun gtk %gtk2_immodule_postun -%post -n libibus2 -p /sbin/ldconfig +%post -n libibus-1_0-0 -p /sbin/ldconfig -%postun -n libibus2 -p /sbin/ldconfig +%postun -n libibus-1_0-0 -p /sbin/ldconfig %if %{build_gtk3} @@ -204,7 +204,7 @@ rm -rf %buildroot %{_datadir}/pixmaps/* %{_prefix}/%{_lib}/ibus -%files -n libibus2 +%files -n libibus-1_0-0 %defattr(-,root,root,-) %{_libdir}/lib*.so.* %{_libdir}/girepository-1.0/IBus-1.0.typelib From fec622cb5765719d4f18e063c5b543233575507763cd91e8b990d47bc69786c6 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 12 Oct 2011 16:22:29 +0000 Subject: [PATCH 2/3] Accepting request 87571 from home:ftake:branches:M17N submit changelog and remove unneeded BuildRequires OBS-URL: https://build.opensuse.org/request/show/87571 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=29 --- ibus.changes | 6 ++++++ ibus.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ibus.changes b/ibus.changes index 8a21b37..d8aa9fd 100644 --- a/ibus.changes +++ b/ibus.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 12 12:50:19 UTC 2011 - ftake@geeko.jp + +- update to 1.4.0 + * Status icon for GNOME 3 (bug#723591) + ------------------------------------------------------------------- Tue Sep 6 17:17:56 UTC 2011 - ftake@geeko.jp diff --git a/ibus.spec b/ibus.spec index e02beb7..70edddc 100644 --- a/ibus.spec +++ b/ibus.spec @@ -38,7 +38,7 @@ PreReq: /usr/bin/touch Provides: locale(ja;ko;zh) BuildRequires: gettext-devel gtk-doc libtool python -BuildRequires: dbus-1-devel dbus-1-glib-devel dbus-1-python-devel gtk2-devel +BuildRequires: dbus-1-python-devel gtk2-devel BuildRequires: gconf2-devel python-gobject2-devel update-desktop-files BuildRequires: fdupes gobject-introspection-devel intltool iso-codes-devel Requires: python-gtk dbus-1-python notification-daemon iso-codes gconf2 python-xdg python-notify gobject-introspection From d4034702e281f1538405a557d01dc9119fa9276ab6d493e408cc07b0923ba5d3 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 13 Oct 2011 09:42:35 +0000 Subject: [PATCH 3/3] - Add obsoletes for libibus2-32bit in baselibs.conf OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=30 --- baselibs.conf | 2 ++ ibus.changes | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/baselibs.conf b/baselibs.conf index f80d939..ed8b0cd 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -23,3 +23,5 @@ ibus-gtk3 postun "%endif" supplements "packageand(ibus:gtk3-)" libibus-1_0-0 + obsoletes "libibus2- < " + diff --git a/ibus.changes b/ibus.changes index d8aa9fd..985c4d5 100644 --- a/ibus.changes +++ b/ibus.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 13 11:42:01 CEST 2011 - tiwai@suse.de + +- Add obsoletes for libibus2-32bit in baselibs.conf + ------------------------------------------------------------------- Wed Oct 12 12:50:19 UTC 2011 - ftake@geeko.jp