[Fedora-i18n-bugs] [ibus-hangul] Update to 1.4.0-3.

[Daiki Ueno]

commit 68a22effe333c93214fb523064c618e5447da4e3
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Fri Feb 10 17:57:52 2012 +0900

    Update to 1.4.0-3.

 ibus-hangul-use-system-icon.patch |   36 ++++++++++++++++++++++++++++++++++++
 ibus-hangul.spec                  |   34 +++++++++++++++++++++++++++++++++-
 2 files changed, 69 insertions(+), 1 deletions(-)
---
diff --git a/ibus-hangul-use-system-icon.patch b/ibus-hangul-use-system-icon.patch
new file mode 100644
index 0000000..2914004
--- /dev/null
+++ b/ibus-hangul-use-system-icon.patch
@@ -0,0 +1,36 @@
+diff -ru ibus-hangul-1.4.0.orig/setup/ibus-setup-hangul.desktop.in ibus-hangul-1.4.0/setup/ibus-setup-hangul.desktop.in
+--- ibus-hangul-1.4.0.orig/setup/ibus-setup-hangul.desktop.in	2011-12-29 23:14:31.000000000 +0900
++++ ibus-hangul-1.4.0/setup/ibus-setup-hangul.desktop.in	2012-02-10 17:50:59.168224204 +0900
+@@ -3,7 +3,7 @@
+ _Name=IBus Hangul Preferences
+ _Comment=Set IBus Hangul Preferences
+ Exec=ibus-setup-hangul
+-Icon=ibus-setup-hangul
++Icon=ibus-hangul
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+diff -ru ibus-hangul-1.4.0.orig/src/hangul.xml.in.in ibus-hangul-1.4.0/src/hangul.xml.in.in
+--- ibus-hangul-1.4.0.orig/src/hangul.xml.in.in	2010-03-29 00:04:19.000000000 +0900
++++ ibus-hangul-1.4.0/src/hangul.xml.in.in	2012-02-10 17:53:31.265182655 +0900
+@@ -16,7 +16,7 @@
+ 			<language>ko</language>
+ 			<license>GPL</license>
+ 			<author>Peng Huang &lt;shawn.p.huang at gmail.com&gt;</author>
+-			<icon>${pkgdatadir}/icons/ibus-hangul.png</icon>
++			<icon>ibus-hangul</icon>
+ 			<layout>us</layout>
+ 			<longname>Korean</longname>
+ 			<description>Korean Input Method</description>
+diff -ru ibus-hangul-1.4.0.orig/src/main.c ibus-hangul-1.4.0/src/main.c
+--- ibus-hangul-1.4.0.orig/src/main.c	2011-03-06 13:53:42.000000000 +0900
++++ ibus-hangul-1.4.0/src/main.c	2012-02-10 17:26:04.361601262 +0900
+@@ -82,7 +82,7 @@
+                                                      "ko",
+                                                      "GPL",
+                                                      "Peng Huang <shawn.p.huang at gmail.com>",
+-                                                     PKGDATADIR"/icon/ibus-hangul.svg",
++                                                     "ibus-hangul",
+                                                      "us"));
+ 
+     factory = ibus_factory_new (ibus_bus_get_connection (bus));
diff --git a/ibus-hangul.spec b/ibus-hangul.spec
index 2f0021f..82e6686 100644
--- a/ibus-hangul.spec
+++ b/ibus-hangul.spec
@@ -12,7 +12,7 @@
 
 Name:       ibus-hangul
 Version:    1.4.0
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    The Hangul engine for IBus input platform
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -22,6 +22,7 @@ Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:    series
 Patch1:     ibus-hangul-xx-icon-symbol.patch
 Patch2:     ibus-hangul-no-ibus-daemon.patch
+Patch3:     ibus-hangul-use-system-icon.patch
 
 BuildRequires:  gettext-devel
 BuildRequires:  intltool
@@ -45,6 +46,7 @@ libhangul.
 %setup -q
 %patch1 -p1 -b .icon-symbol
 %patch2 -p1 -b .no-ibus-daemon
+%patch3 -p1 -b .use-system-icon
 
 %build
 autoreconf
@@ -55,10 +57,35 @@ make %{?_smp_mflags}
 %install
 make DESTDIR=${RPM_BUILD_ROOT} install INSTALL="install -p"
 
+# install icons into standard location
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/64x64/apps
+
+install -p -m 644 icons/ibus-hangul.png \
+	${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/64x64/apps
+
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/scalable/apps
+
+install -p -m 644 icons/ibus-hangul.svg \
+	${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/scalable/apps
+
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/ibus-hangul/icons
+
 desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/ibus-setup-hangul.desktop
 
 %find_lang %{name}
 
+%post
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %files -f %{name}.lang
 %doc AUTHORS COPYING README
 %{_libexecdir}/ibus-engine-hangul
@@ -67,8 +94,13 @@ desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/ibus-setup-hangu
 %{_datadir}/ibus/component/*
 %{_libdir}/ibus-hangul/setup/*
 %{_datadir}/applications/ibus-setup-hangul.desktop
+%{_datadir}/icons/hicolor/*/apps/ibus-hangul.*
 
 %changelog
+* Fri Feb 10 2012 Daiki Ueno <dueno at redhat.com> - 1.4.0-3
+- Add ibus-hangul-use-system-icon.patch
+- Fix bug 789230 - ibus hangul Icon missing in gnome-shell (fedora 17)
+
 * Tue Jan 31 2012 Daiki Ueno <dueno at redhat.com> - 1.4.0-2
 - Add ibus-hangul-no-ibus-daemon.patch.
 - Fix bug 784377 - [abrt] ibus-hangul-1.4.0-1.fc16