Accepting request 378531 from home:fcrozat:branches:M17N

- Do not apply SLE patches on openSUSE 13.2.
- Drop ibus-adapt-new-vala.patch, not needed after all with vala
  0.32.

OBS-URL: https://build.opensuse.org/request/show/378531
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=150
This commit is contained in:
2016-03-26 11:30:07 +00:00
committed by Git OBS Bridge
parent 3fd87cbee1
commit d36a4d1dd9
3 changed files with 8 additions and 17 deletions

View File

@@ -75,9 +75,6 @@ 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-FEATURE-SLE ibus-adapt-new-vala.patch qzhao@suse.com
# fix ibus compile error under new vala, for SLE Desktop 12 SP2.
Patch12: ibus-adapt-new-vala.patch
BuildRequires: dbus-1-glib-devel
BuildRequires: dbus-1-python-devel >= 0.83.0
BuildRequires: dconf-devel >= 0.7.5
@@ -260,10 +257,9 @@ sed -i \
%patch8 -p1
%patch9 -p1
%if !0%{?is_opensuse}
%if 0%{?suse_version} == 1315 && !0%{?is_opensuse}
%patch10 -p1
%patch11 -p1
%patch12 -p1
%endif
cp -r %{SOURCE2} .