From 502b699aeeefe928c6e4113b593e7e49730bc0c74446bf1c46cf461274a7a987 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Sun, 27 Jul 2014 15:45:22 +0000 Subject: [PATCH] Accepting request 242603 from home:MargueriteSu:branches:M17N OBS-URL: https://build.opensuse.org/request/show/242603 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=112 --- ibus.changes | 20 +++++++++++++------- ibus.spec | 8 ++++---- macros.ibus | 15 +++++++++++++++ 3 files changed, 32 insertions(+), 11 deletions(-) diff --git a/ibus.changes b/ibus.changes index 9f82fad..81df323 100644 --- a/ibus.changes +++ b/ibus.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jul 27 15:15:28 UTC 2014 - i@marguerite.su + +- fix hillwood's timestamp in changelog +- add two more macros to macros.ibus + ------------------------------------------------------------------- Sat Jul 26 18:01:19 UTC 2014 - i@marguerite.su @@ -119,7 +125,7 @@ Mon Jan 27 16:49:27 UTC 2014 - ftake@geeko.jp * fix ibus-ui-gtk3 crashes if layout is en_intl (bnc#859354) ------------------------------------------------------------------- -Mon Nov 25 21:50:12 CST 2013 - hillwood@linuxfans.org +Mon Nov 25 13:50:12 UTC 2013 - hillwood@linuxfans.org - Better way to fix cursor following problem (on_the_spot bug) under libreoffice-kde4 (bnc#851982). @@ -146,7 +152,7 @@ Thu Oct 17 07:13:31 UTC 2013 - i@marguerite.su * ibus qt tray icon is not in keeping with KDE monochrome icon look. ------------------------------------------------------------------- -Mon Oct 14 09:22:41 CST 2013 - hillwood@linuxfans.org +Mon Oct 14 01:22:41 UTC 2013 - hillwood@linuxfans.org - Obsoletes libibus-1_0-0 @@ -207,7 +213,7 @@ Tue Jul 30 17:19:47 UTC 2013 - ftake@geeko.jp * Update UI, improve performance, fix build problems ------------------------------------------------------------------- -Tue Jul 9 22:23:47 CST 2013 - hillwood@linuxfans.org +Tue Jul 9 14:23:47 UTC 2013 - hillwood@linuxfans.org - Fix cursor following problem in KDE4 for libreoffice @@ -286,7 +292,7 @@ Sat Feb 16 15:59:12 UTC 2013 - ftake@geeko.jp * update ibus-fix-tray-icon-on-gnome-3.6.patch ------------------------------------------------------------------- -Sat Feb 9 13:13:13 CST 2013 - hillwood@linuxfans.org +Sat Feb 9 03:13:13 UTC 2013 - hillwood@linuxfans.org - fix bnc#802967 * fix ibus's tray icon can't show in gnome-shell 3.6 for openSUSE 12.3, @@ -308,7 +314,7 @@ Wed Oct 17 04:20:14 UTC 2012 - douglarek@outlook.com see: http://en.opensuse.org/openSUSE:Specfile_guidelines#Parallel_make ------------------------------------------------------------------- -Sat Aug 25 20:25:17 CST 2012 - hillwood@linuxfans.org +Sat Aug 25 12:25:17 UTC 2012 - hillwood@linuxfans.org - update to 1.4.2 Some bug fixings @@ -335,12 +341,12 @@ Thu May 17 05:49:31 UTC 2012 - swyear@gmail.com - fix build error in Factory: ln should be done in buildroot ------------------------------------------------------------------- -Wed Mar 7 21:54:43 CST 2012 - hillwood@linuxfans.org +Wed Mar 7 13:54:43 UTC 2012 - hillwood@linuxfans.org - Fix FSF-address warnings in RPMLINT report ------------------------------------------------------------------- -Wed Mar 07 12:27:57 CST 2012 - hillwood@linuxfans.org +Wed Mar 07 04:27:57 UTC 2012 - hillwood@linuxfans.org - Update to 1.4.1 * Many bug fixings diff --git a/ibus.spec b/ibus.spec index e6b0100..0a155a2 100644 --- a/ibus.spec +++ b/ibus.spec @@ -33,7 +33,7 @@ License: LGPL-2.1+ Group: System/I18n/Chinese Url: https://github.com/ibus/ #Source: https://github.com/ibus/ibus/releases/download/%{version}/%{name}-%{version}.tar.gz -Source: %{name}-%{version}.tar.gz +Source: %{name}-%{version}.tar.gz Source2: README.SUSE Source3: xim.ibus.suse.template Source4: xim.d-ibus-121 @@ -60,10 +60,10 @@ Patch4: ibus-xim-fix-re-focus-after-lock.patch # Thus ibus-setup and bindings are still bytecompiled with python2. # Then python3 support is useless, so we force python3 when python3 # is enabled, and fix syntax errors in python-config.py -Patch5: ibus-force-python3.patch +Patch5: ibus-force-python3.patch # PATCH-FIX-UPSTREAM marguerite@opensuse.org # lower vala version -Patch6: ibus-vala-0.18.patch +Patch6: ibus-vala-0.18.patch BuildRequires: dbus-1-glib-devel BuildRequires: dbus-1-python-devel >= 0.83.0 %if %{with_automatic_config} @@ -111,7 +111,7 @@ Requires: libibus-1_0-5 = %{version} # ibus-setup will require typelib(Gdk) typelib(GdkX11), typelib(Gtk) # which are provided by two packages in openSUSE, so we limit their # versions to 3.0 only. -Requires: typelib-1_0-Gtk-3_0 +Requires: typelib-1_0-Gtk-3_0 %endif Recommends: %{name}-lang diff --git a/macros.ibus b/macros.ibus index b90779b..c15289a 100644 --- a/macros.ibus +++ b/macros.ibus @@ -1,4 +1,10 @@ # RPM macros for ibus +# You should use %%{_ibus_icondir} and %%{_ibus_tabledir} +# in %%files section +# For ibus table packaging, you have to: +# Use %%ibus_table_requires as requires +# Use %%ibus_table_index_post %%DB_NAME in %%post to create +# table indexes for your table package. %_ibus_includedir %{_includedir}/ibus-1.0 %_ibus_libdir %{_libdir}/ibus %_ibus_libexecdir %{_ibus_libdir} @@ -16,4 +22,13 @@ Requires: ibus %ibus_table_requires \ Requires: ibus-table +Requires(post): ibus-table +%ibus_table_index_post() \ +%if "x%1" != "x%%1" \ +DB_NAME="%1" \ +%else \ +echo "Missing argument DB_NAME in call to %%ibus_table_create_index." \ +false \ +%endif \ +/usr/bin/ibus-table-createdb -i -n ${DB_NAME}.db || true