Accepting request 503386 from home:qzhao:branches:M17N

Format the SPEC file and changelog to satisfy openSUSE packaging requirements.

OBS-URL: https://build.opensuse.org/request/show/503386
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=165
This commit is contained in:
Takashi Iwai 2017-06-13 20:24:05 +00:00 committed by Git OBS Bridge
parent ced48654c0
commit 88c668b7aa
2 changed files with 58 additions and 52 deletions

View File

@ -1,10 +1,10 @@
-------------------------------------------------------------------
Sat May 27 12:21:30 UTC 2017 - qzhao@suse.com
- Update ibus.spec file, copy auto-start files to SOURCE directory
- Update ibus.spec: copy auto-start files to SOURCE directory
to enable modifications before compile.
- Add ibus-disable-engines-preload-in-GNOME.patch, Disable load
preload-engines actions in SLE, which is unnecessary for mono IMF
- Add ibus-disable-engines-preload-in-GNOME.patch: Disable load
preload-engines actions in SLE, which is unnecessary for mono IMF
in SLE and may cause CJK user login failed (bsc#1036729).
-------------------------------------------------------------------
@ -48,7 +48,7 @@ Wed Mar 1 13:16:08 UTC 2017 - dimstar@opensuse.org
-------------------------------------------------------------------
Wed Dec 28 15:04:47 UTC 2016 - hillwood@opensuse.org
- Disable emoji dict build.
- Disable emoji dict build.
-------------------------------------------------------------------
Thu Aug 25 02:40:50 UTC 2016 - hillwood@opensuse.org
@ -62,13 +62,13 @@ Thu Aug 25 02:40:50 UTC 2016 - hillwood@opensuse.org
* ui/gtk3: Fix panel CSS format for GTK 3.20
* engine: Implement Emoji typing with XKB engines
* engine: Add emoji-list.html
* engine: Use annotations/en.xml from unocode.org but not
* engine: Use annotations/en.xml from unocode.org but not
emoji-list.html
* Fix typo in configure.ac
* tests/ibus-engine-switch: Don't try to remove non-existing GSource
* Fix make dist
* Fix Croatian language code in simple.xml
* Replace deprecated GSimpleAsyncResult with GTask since GLib 2.46
* Replace deprecated GSimpleAsyncResult with GTask since GLib 2.46
-------------------------------------------------------------------
Mon Apr 18 14:40:35 UTC 2016 - ftake@geeko.jp
@ -107,15 +107,15 @@ Wed Mar 23 10:29:32 UTC 2016 - fcrozat@suse.com
Mon Feb 28 17:59:28 CET 2016 - qzhao@suse.com
- Add ibus-adapt-new-vala.patch: Fix ibus compile error under
new vala compiler, for SLE Desktop 12 SP2. This patch is only
for SLED.
new vala compiler in SLE Desktop 12 SP2.
--------------------------------------------------------------------
Mon Feb 28 15:57:01 CET 2016 - qzhao@suse.com
- Add conflict to fcitx to fulfill FATE#319095
deprecate fcitx chinese input method in favor of ibus
(dummy bsc#933411). This modification is only for SLED.
- Update ibus.spec: Add "Conflicts: fcitx" tag in SLE,
This can help to keep old fcitx input-frame for people
who updated from SLE-12-SP0 to SP1, means to avoid the exception
which was brought by FATE#319095.
-------------------------------------------------------------------
Mon Feb 28 14:57:01 CET 2016 - sbrabec@suse.com
@ -125,16 +125,20 @@ Mon Feb 28 14:57:01 CET 2016 - sbrabec@suse.com
-------------------------------------------------------------------
Mon Feb 28 12:20:10 CET 2016 - qzhao@suse.com
- Add setup-switch-im.patch. Switch to ibus when ibus not
running.(bnc#899259). This patch is only for SLED.
- Add setup-switch-im.patch: In SLE, if user launch ibus-setup
without ibus service daemon running, it will warn the user and
switch current input-frame to ibus by setting an environment
variable. Note, the setting will make effect the next time this
user login to desktop (bsc#899259).
-------------------------------------------------------------------
Mon Feb 28 10:30:20 CET 2016 - qzhao@suse.com
- Add hide-setup-menu.patch
Make ibus-setup launch from indicator field.(bnc#899259)
Remove ibus-setup.desktop from main menu. This patch is only
for SLED.
- Add hide-setup-menu.patch: Remove ibus-setup.desktop entry in
SLE from desktop main menu, So it will only be launched from
desktop indicator field now.
This action is for insure ibus-setup runs with ibus-daemon in
background everytime (bsc#899259).
-------------------------------------------------------------------
Wed Feb 24 11:01:08 CET 2016 - tiwai@suse.de
@ -185,7 +189,7 @@ Sat Mar 28 09:30:59 UTC 2015 - ftake@geeko.jp
- Fix boo#924696: settings of ibus engines are not saved
* Remove inappropriate %ghost from the dconf files
- Disable appindicator for 13.1
* It requires Qt 5.3 to show icons specified by absolute path
* It requires Qt 5.3 to show icons specified by absolute path
-------------------------------------------------------------------
Thu Mar 12 15:27:11 UTC 2015 - ftake@geeko.jp
@ -222,8 +226,8 @@ Tue Oct 14 06:07:18 UTC 2014 - hillwood@linuxfans.org
- Update to 1.5.9
* Enable preedit color on external preedit window with x11 applications.
* Do not fail ibus-setup when en_US.UTF-8 is not installed.
* Fix compose keys in French layout bepo variant.
* Do not fail ibus-setup when en_US.UTF-8 is not installed.
* Fix compose keys in French layout bepo variant.
-------------------------------------------------------------------
Mon Oct 13 09:18:34 UTC 2014 - gber@opensuse.org
@ -297,7 +301,7 @@ Thu Jul 31 12:07:24 UTC 2014 - ftake@geeko.jp
- remove patches merged by upstream
* add-libgnomekbd-and-load-preload-engines.patch
* reload-preload-engines-until-users-customize-the-list.patch
- obsoletes python-ibus when packaged for Python 3
- obsoletes python-ibus when packaged for Python 3
-------------------------------------------------------------------
Sun Jul 27 15:15:28 UTC 2014 - i@marguerite.su
@ -358,7 +362,7 @@ Thu Jun 5 12:06:53 UTC 2014 - ftake@geeko.jp
* Fix leakage in ibus_get_local_machine_id()
* Do not show Property Panel by default
* Focus-in events do not move Property Panel
if the panel is configured to be always shown
if the panel is configured to be always shown
-------------------------------------------------------------------
Tue May 20 15:28:40 CEST 2014 - tiwai@suse.de
@ -385,7 +389,7 @@ Mon Mar 17 15:37:25 UTC 2014 - ftake@geeko.jp
- Update reload-preload-engines-until-users-customize-the-list.patch
- Update ibus-python-install-dir.patch
* modify Python 2 path in configure.ac instead of Makefile.am
- Refresh add-libgnomekbd-and-load-preload-engines.patch
- Refresh add-libgnomekbd-and-load-preload-engines.patch
-------------------------------------------------------------------
Mon Mar 17 12:29:40 UTC 2014 - fcrozat@suse.com
@ -428,7 +432,7 @@ Mon Jan 27 16:49:27 UTC 2014 - ftake@geeko.jp
-------------------------------------------------------------------
Mon Nov 25 13:50:12 UTC 2013 - hillwood@linuxfans.org
- Better way to fix cursor following problem (on_the_spot bug)
- Better way to fix cursor following problem (on_the_spot bug)
under libreoffice-kde4 (bnc#851982).
-------------------------------------------------------------------
@ -461,8 +465,8 @@ Mon Oct 14 01:22:41 UTC 2013 - hillwood@linuxfans.org
Thu Oct 10 17:50:08 UTC 2013 - ftake@geeko.jp
- Update show-input-mode-icon.patch
* fix ibus-ui-gtk3 hangs up
* fix icons are cropped on KDE
* fix ibus-ui-gtk3 hangs up
* fix icons are cropped on KDE
-------------------------------------------------------------------
Sun Oct 6 13:43:39 UTC 2013 - ftake@geeko.jp
@ -490,7 +494,7 @@ Fri Sep 13 13:49:44 UTC 2013 - ftake@geeko.jp
- Fix dconf schema was not updated for automatic configuration
- Fix 00-upstream-settings was wrongly marked as %config
- Fix /etc/dconf/db/ibus was not owned by package
- Add %if %endif for automatic configuration
- Add %if %endif for automatic configuration
-------------------------------------------------------------------
Thu Sep 12 17:29:24 UTC 2013 - ftake@geeko.jp
@ -528,8 +532,8 @@ Thu Jul 4 15:41:12 UTC 2013 - ftake@geeko.jp
* Fix crash of ibus-setup
- Update to 1.5.1 by hillwood@linuxfans.org
* Add fr(bepo) XKB engine
* Fix crash
- Update to 1.5.0 by douglarek@outlook.com
* Fix crash
- Update to 1.5.0 by douglarek@outlook.com
* Renew IM-switch UI, logic, and shortcut customization
* Integrate XKB keyboard layouts into IME. Now ibus can manage both
IME and XKB layouts seamlessly
@ -538,14 +542,14 @@ Thu Jul 4 15:41:12 UTC 2013 - ftake@geeko.jp
* Improve gobject-introspection support
* Improve vala language support
* New functions to restrict config signal: ibus_config_watch/unwatch
* Remove gnome-icon-theme-legacy dependency.
* Add version property in IBusEngineDesc.
* Add IBusProperty.symbol for the short label.
* Remove gnome-icon-theme-legacy dependency.
* Add version property in IBusEngineDesc.
* Add IBusProperty.symbol for the short label.
* Support dconf 0.13.4
* Add ibus command line tool
* Add ibus command line tool
* Improve unit test
* ibus-daemon now monitors .xml files by default
* "make check" does not require "make install"
* "make check" does not require "make install"
* Support out-of-tree build
* pygobject override is added to help migrate from the old python binding.
* Many bug fixings.
@ -567,7 +571,7 @@ Thu Jul 4 15:41:12 UTC 2013 - ftake@geeko.jp
-------------------------------------------------------------------
Tue Apr 2 17:49:53 UTC 2013 - ftake@geeko.jp
- add "Supplements" tag to ibus-gnome-shell
- add "Supplements" tag to ibus-gnome-shell
-------------------------------------------------------------------
Thu Mar 28 18:26:44 UTC 2013 - i@marguerite.su
@ -590,7 +594,7 @@ Sat Feb 16 15:59:12 UTC 2013 - ftake@geeko.jp
- better solution for bnc#802967
* add ibus_indicator-14.patch: a shell extension for GNOME 3.6
* update ibus-fix-tray-icon-on-gnome-3.6.patch
* update ibus-fix-tray-icon-on-gnome-3.6.patch
-------------------------------------------------------------------
Sat Feb 9 03:13:13 UTC 2013 - hillwood@linuxfans.org
@ -603,7 +607,7 @@ Sat Feb 9 03:13:13 UTC 2013 - hillwood@linuxfans.org
Thu Jan 10 12:50:49 UTC 2013 - ftake@geeko.jp
- add ibus-fix-docs-build-error.patch: to fix build error
in Factory
in Factory
-------------------------------------------------------------------
Wed Oct 17 04:20:14 UTC 2012 - douglarek@outlook.com
@ -629,17 +633,17 @@ Mon Jun 18 10:59:35 CEST 2012 - tiwai@suse.de
-------------------------------------------------------------------
Thu May 17 07:11:11 UTC 2012 - swyear@gmail.com
- remove soft link in RPM_BUILD_ROOT
- remove soft link in RPM_BUILD_ROOT
-------------------------------------------------------------------
Thu May 17 06:10:46 UTC 2012 - swyear@gmail.com
- mkdir target directory before link
- mkdir target directory before link
-------------------------------------------------------------------
Thu May 17 05:49:31 UTC 2012 - swyear@gmail.com
- fix build error in Factory: ln should be done in buildroot
- fix build error in Factory: ln should be done in buildroot
-------------------------------------------------------------------
Wed Mar 7 13:54:43 UTC 2012 - hillwood@linuxfans.org
@ -657,7 +661,7 @@ Wed Mar 07 04:27:57 UTC 2012 - hillwood@linuxfans.org
Sun Feb 12 17:29:16 UTC 2012 - ftake@geeko.jp
- Fix problem default preload engines do not work (bnc#746612)
- Fix slow down issue after "source xim.d/ibus" in a SSH session
- Fix slow down issue after "source xim.d/ibus" in a SSH session
-------------------------------------------------------------------
Tue Jan 24 10:12:30 UTC 2012 - vuntz@opensuse.org
@ -679,7 +683,7 @@ Wed Oct 12 12:50:19 UTC 2011 - ftake@geeko.jp
-------------------------------------------------------------------
Tue Sep 6 17:17:56 UTC 2011 - ftake@geeko.jp
- Fix xim.d/ibus to launch D-Bus daemon (only for newer D-Bus)
- Fix xim.d/ibus to launch D-Bus daemon (only for newer D-Bus)
-------------------------------------------------------------------
Mon Aug 8 16:34:13 CEST 2011 - tiwai@suse.de
@ -720,7 +724,7 @@ Mon Jun 13 16:15:29 UTC 2011 - swyear@gmail.com
installed, system can use other input method instead.
- Update README
- Remove kimpanel script from start up script
- Add gtk3 immodule
- Add gtk3 immodule
-------------------------------------------------------------------
Wed Mar 9 11:58:08 CET 2011 - tiwai@suse.de
@ -732,12 +736,12 @@ Wed Nov 17 08:44:04 UTC 2010 - mxwu@novell.com
- Upgrade to ibus 1.3.8:
* Fix CPU 100% usage with signal.SIGCHLD
* Destroy existing connection before creating a new
* Destroy existing connection before creating a new
connection, and only create the fake context once.
* Move the candidate window just above the cursor
* Move the candidate window just above the cursor
when the window and a preedit string overlap.
* Enable key snooper by default again
* Always consume the hotkey, even if the hotkey
* Always consume the hotkey, even if the hotkey
associated engine already activated.
* Fix race condition in bus_ibus_impl_create_engine()
* Fix a build error of IBus-1.0.gir with gobject-introspection 0.9.6
@ -747,7 +751,7 @@ Wed Nov 17 08:44:04 UTC 2010 - mxwu@novell.com
* Fix memory leak in ibus_input_context_process_key_event by Fujiwarat
* Fix segv in bus_engine_proxy_process_key_event_reply_cb
* Fix property issue.
* Updated many translations.
* Updated many translations.
-------------------------------------------------------------------
Tue Jul 13 07:44:40 UTC 2010 - mxwu@novell.com
@ -805,5 +809,5 @@ Thu Jan 28 10:36:38 UTC 2010 - mxwu@novell.com
-------------------------------------------------------------------
Thu Jan 28 07:41:08 UTC 2010 - mxwu@novell.com
- Initial import
- Initial import

View File

@ -45,7 +45,7 @@ Source11: ibus-autostart.desktop
Source99: baselibs.conf
# PATCH-FIX-OPENSUSE ibus-python-install-dir.patch ftake@geeko.jp
Patch0: ibus-python-install-dir.patch
# PATFH-FIX-SUSE ibus-xim-fix-re-focus-after-lock.patch bnc#874869 tiwa@suse.de -- Fix lost XIM input after screenlock
# PATFH-FIX-OPENSUSE ibus-xim-fix-re-focus-after-lock.patch bnc#874869 tiwai@suse.de -- Fix lost XIM input after screenlock
Patch4: ibus-xim-fix-re-focus-after-lock.patch
# PATCH-FIX-UPSTREAM marguerite@opensuse.org
# Ibus will use python3 only when variable PYTHON2 is empty.
@ -66,7 +66,8 @@ Patch10: hide-setup-menu.patch
# PATCH-FIX-SLE setup-switch-im.patch bnc#899259 qzhao@suse.com
# switch to ibus when ibus not running.
Patch11: setup-switch-im.patch
# PATCH-FIX-SLE ibus-disable-engines-preload-in-GNOME.patch bsc#1036729 qzhao@suse.com -- Disable ibus engines preload in GNOME for These works are handled by gnome-shell.
# PATCH-FIX-SLE ibus-disable-engines-preload-in-GNOME.patch bnc#1036729 qzhao@suse.com
# Disable ibus engines preload in GNOME for These works are handled by gnome-shell.
Patch12: ibus-disable-engines-preload-in-GNOME.patch
BuildRequires: dbus-1-glib-devel
BuildRequires: dbus-1-python-devel >= 0.83.0
@ -105,7 +106,6 @@ BuildRequires: pkgconfig(vapigen)
%if %{with_wayland}
BuildRequires: pkgconfig(wayland-client) >= 1.2.0
%endif
# BuildRequires: nodejs-emojione
BuildRequires: pkgconfig(xkbcommon)
# copy_deep method is supported since 0.31.1
BuildRequires: vala >= 0.31.1
@ -118,7 +118,9 @@ Requires: libibus-1_0-5 = %{version}
# versions to 3.0 only.
Requires: typelib-1_0-Gtk-3_0
Recommends: %{name}-lang
# PATCH-FEATURE-SLE Add conflict with fcitx FATE #319095 qzhao@suse.com -- Solve the problem for the people update from SP0 to SP1
# PATCH-FEATURE-SLE FATE#319095 qzhao@suse.com
# Add conflict with fcitx to keep old IMF for people who update from SLE-12 SP0 to SP1.
%if !0%{?is_opensuse}
Conflicts: fcitx
%endif