From 0c7dbe40e7aac3795186884ee1cd701629223b81a64332afc9004f5cc4b542ae Mon Sep 17 00:00:00 2001
From: Marguerite Su <i@marguerite.su>
Date: Thu, 17 Oct 2013 07:29:53 +0000
Subject: [PATCH] Accepting request 203558 from home:MargueriteSu:branches:M17N

give ibus systray icon a better look in kde.

OBS-URL: https://build.opensuse.org/request/show/203558
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=81
---
 ibus.changes    |  8 ++++++++
 ibus.spec       | 42 ++++++++++++++++++++++++++++++++++++++++++
 kde-12.2.tar.gz |  3 +++
 kde.tar.gz      |  3 +++
 4 files changed, 56 insertions(+)
 create mode 100644 kde-12.2.tar.gz
 create mode 100644 kde.tar.gz

diff --git a/ibus.changes b/ibus.changes
index 08abfce..15eeaeb 100644
--- a/ibus.changes
+++ b/ibus.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Oct 17 07:13:31 UTC 2013 - i@marguerite.su
+
+- add a branding-openSUSE-KDE subpackage.
+  * provides kde monochrome icons for 13.1 default KDE theme.
+- port fix for bnc#820218 here
+  * ibus qt tray icon is not in keeping with KDE monochrome icon look.
+
 -------------------------------------------------------------------
 Mon Oct 14 09:22:41 CST 2013 - hillwood@linuxfans.org
 
diff --git a/ibus.spec b/ibus.spec
index 8c3ad16..d3018b6 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -30,6 +30,8 @@ Source:         http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 Source2:        ibus-README.suse  
 Source3:        xim.ibus.suse.template
 Source4:        xim.d-ibus-121
+Source5:        kde.tar.gz
+Source6:        kde-12.2.tar.gz
 %if %{with_automatic_config}
 Patch0:         ibus-python-install-dir.patch
 # PATCH-FEATURE-UPSTREAM add-libgnomekbd-and-load-preload-engines.patch Issue 1641 ftake@geeko.jp
@@ -62,6 +64,10 @@ BuildRequires:  libgnomekbd-devel
 %endif
 BuildRequires:  libnotify-devel >= 0.7
 BuildRequires:  libtool
+# directory ownership {
+BuildRequires:  oxygen-icon-theme
+BuildRequires:  oxygen-icon-theme-scalable
+# }
 BuildRequires:  pkg-config
 BuildRequires:  python >= 2.5
 BuildRequires:  python-gobject2-devel
@@ -140,7 +146,20 @@ Requires:       %{name} = %{version}
 %description -n python-ibus
 This package contains python module for ibus
 
+%package branding-openSUSE-KDE
+Summary:        openSUSE branding for KDE
+Group:          System/GUI/KDE
+Requires:       ibus = %{version}
+Supplements:    packageand(ibus:kdelibs4)
+Supplements:    packageand(ibus:branding-openSUSE-KDE)
+Provides:       ibus-branding = %{version}
+Conflicts:      otherproviders(ibus-branding)
+%if 0%{?suse_version} >= 1140
+BuildArch:      noarch
+%endif
 
+%description branding-openSUSE-KDE
+openSUSE branding for KDE monochrome icons in systray.
 
 %package devel
 Summary:        Development tools for ibus
@@ -225,6 +244,23 @@ ln -sf %{_datadir}/icons/hicolor/48x48/apps/ibus-keyboard.png \
 # touch for %%ghost
 touch $RPM_BUILD_ROOT/%{_sysconfdir}/dconf/db/ibus
 
+# fix kde monochrome icons
+%if 0%{?suse_version} >= 1230
+cp -r %{SOURCE5} ./
+%else
+cp -r %{SOURCE6} ./
+mv kde-12.2.tar.gz kde.tar.gz
+%endif
+tar -xzf kde.tar.gz
+pushd kde
+for i in 16 22 24 32 48 ; do
+	mkdir -p %{buildroot}%{_datadir}/icons/oxygen/${i}x${i}/apps/
+	cp -r ibus-keyboard.${i}x${i}.png %{buildroot}%{_datadir}/icons/oxygen/${i}x${i}/apps/ibus-keyboard.png
+done
+mkdir -p %{buildroot}%{_datadir}/icons/oxygen/scalable/apps/ 
+cp -r ibus-keyboard.svgz %{buildroot}%{_datadir}/icons/oxygen/scalable/apps/
+popd
+
 %suse_update_desktop_file  %name-setup System Utility settings
 
 %fdupes %buildroot/%_prefix
@@ -317,4 +353,10 @@ dconf update
 %{_datadir}/gir-1.0/IBus-1.0.gir
 %{_datadir}/vala/vapi/*
 
+%files branding-openSUSE-KDE
+%defattr(-,root,root,-)
+%dir %{_datadir}/icons/oxygen/24x24
+%dir %{_datadir}/icons/oxygen/24x24/apps
+%{_datadir}/icons/oxygen/*/apps/ibus-keyboard.*
+
 %changelog
diff --git a/kde-12.2.tar.gz b/kde-12.2.tar.gz
new file mode 100644
index 0000000..21819bc
--- /dev/null
+++ b/kde-12.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bd72b5ac9d1ab666922a0d115f4c54a1d1fc3e73de035b2ad1e4df54fd0fc738
+size 7170
diff --git a/kde.tar.gz b/kde.tar.gz
new file mode 100644
index 0000000..af438ee
--- /dev/null
+++ b/kde.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ef741cd60d35c0b8a84c3ddd11118dceda20248fbe0a3e5dbfbca619f06791aa
+size 5324