From d36a4d1dd95be269f4b55706c12715cc4471e18f84fb42e3a2d76fe1ec916423 Mon Sep 17 00:00:00 2001
From: Fuminobu Takeyama <ftake@geeko.jp>
Date: Sat, 26 Mar 2016 11:30:07 +0000
Subject: [PATCH] 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
---
 ibus-adapt-new-vala.patch | 12 ------------
 ibus.changes              |  7 +++++++
 ibus.spec                 |  6 +-----
 3 files changed, 8 insertions(+), 17 deletions(-)
 delete mode 100644 ibus-adapt-new-vala.patch

diff --git a/ibus-adapt-new-vala.patch b/ibus-adapt-new-vala.patch
deleted file mode 100644
index 6ffffe5..0000000
--- a/ibus-adapt-new-vala.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nura ibus-1.5.11/ui/gtk3/indicator.vala ibus-1.5.11_new/ui/gtk3/indicator.vala
---- ibus-1.5.11/ui/gtk3/indicator.vala	2015-07-16 07:08:03.000000000 +0000
-+++ ibus-1.5.11_new/ui/gtk3/indicator.vala	2016-03-02 10:29:19.360124574 +0000
-@@ -304,7 +304,7 @@
-                 method_name);
-     }
- 
--    public override GLib.Variant? service_get_property(GLib.DBusConnection
-+    public override GLib.Variant service_get_property(GLib.DBusConnection
-                                                                 connection,
-                                                        string   sender,
-                                                        string   object_path,
diff --git a/ibus.changes b/ibus.changes
index 28f16c9..10ac7b0 100644
--- a/ibus.changes
+++ b/ibus.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Mar 23 10:29:32 UTC 2016 - fcrozat@suse.com
+
+- Do not apply SLE patches on openSUSE 13.2.
+- Drop ibus-adapt-new-vala.patch, not needed after all with vala
+  0.32.
+
 --------------------------------------------------------------------
 Mon Feb 28 17:59:28 CET 2016 - qzhao@suse.com
 
diff --git a/ibus.spec b/ibus.spec
index 765bce1..b1e5090 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -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} .