[ibus-hangul/f16] Update to 1.4.0-1.

Daiki Ueno ueno at fedoraproject.org
Thu Jan 12 04:22:04 UTC 2012


commit 7b1878af59fe90a26a0dae740e01e411340c3b4c
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Thu Jan 12 13:21:57 2012 +0900

    Update to 1.4.0-1.

 .gitignore                 |    1 +
 ibus-hangul-ibus-1.4.patch |  142 --------------------------------------------
 ibus-hangul.spec           |   23 +++++---
 sources                    |    2 +-
 4 files changed, 17 insertions(+), 151 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1ef17d0..35f81e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ ibus-hangul-1.3.0.20100329.tar.gz
 /ibus-hangul-1.3.0.20100329.tar.gz
 /ibus-hangul-1.3.1.tar.gz
 /ibus-hangul-1.3.2.tar.gz
+/ibus-hangul-1.4.0.tar.gz
diff --git a/ibus-hangul.spec b/ibus-hangul.spec
index 312262d..27b1576 100644
--- a/ibus-hangul.spec
+++ b/ibus-hangul.spec
@@ -1,4 +1,4 @@
-%global require_ibus_version 1.2.99
+%global require_ibus_version 1.3.99
 %global require_libhangul_version 0.1.0
 %if 0%{?fedora} > 15
 %define have_bridge_hotkey 1
@@ -11,7 +11,7 @@
 %endif
 
 Name:       ibus-hangul
-Version:    1.3.2
+Version:    1.4.0
 Release:    1%{?dist}
 Summary:    The Hangul engine for IBus input platform
 License:    GPLv2+
@@ -20,7 +20,6 @@ URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 # dummy source to keep quilt series file
 Source1:    series
-Patch0:     ibus-hangul-ibus-1.4.patch
 Patch1:     ibus-hangul-xx-icon-symbol.patch
 
 BuildRequires:  gettext-devel
@@ -32,6 +31,7 @@ BuildRequires:  ibus-devel >= %{require_ibus_version}
 %if %have_bridge_hotkey
 BuildRequires:  ibus
 %endif
+BuildRequires:  desktop-file-utils
 
 Requires:   ibus >= %{require_ibus_version}
 Requires:   libhangul >= %{require_libhangul_version}
@@ -42,7 +42,6 @@ libhangul.
 
 %prep
 %setup -q
-%patch0 -p1 -b .ibus-1.4
 %patch1 -p1 -b .icon-symbol
 
 %build
@@ -52,23 +51,31 @@ autoreconf
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=${RPM_BUILD_ROOT} install
+make DESTDIR=${RPM_BUILD_ROOT} install INSTALL="install -p"
+
+desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/ibus-setup-hangul.desktop
 
 %find_lang %{name}
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %{_libexecdir}/ibus-engine-hangul
-%{_libexecdir}/ibus-setup-hangul
+%{_bindir}/ibus-setup-hangul
 %{_datadir}/ibus-hangul
 %{_datadir}/ibus/component/*
 %{_libdir}/ibus-hangul/setup/*
+%{_datadir}/applications/ibus-setup-hangul.desktop
 
 %changelog
+* Thu Jan 12 2012 Daiki Ueno <dueno at redhat.com> - 1.4.0-1
+- Update version to 1.4.0.
+- Remove ibus-hangul-ibus-1.4.patch.
+- Drop %%defattr(-,root,root,-) from %%files.
+- Pass -p to install to preserve file timestamps.
+- Install ibus-setup-hangul.desktop properly.
+
 * Thu Nov 24 2011 Daiki Ueno <dueno at redhat.com> - 1.3.2-1
 - Update version to 1.3.2.
-- Require libhangul >= 0.1.0.
 
 * Mon Oct 24 2011 Daiki Ueno <dueno at redhat.com> - 1.3.1-8
 - Rebuild with the latest libhangul.
diff --git a/sources b/sources
index 922b536..878ecb1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b8132e8b11afadd803b2602c63294da5  ibus-hangul-1.3.2.tar.gz
+78899076a928d612c0f72cf74633d6b0  ibus-hangul-1.4.0.tar.gz


More information about the scm-commits mailing list