[ibus-pinyin] Remove the libpinyin integration patch

[Peng Wu]

commit 5febd6024f834cf8244714bb00c032041d5ffe73
Author: Peng Wu <alexepico at gmail.com>
Date:   Tue Jun 12 11:22:39 2012 +0800

    Remove the libpinyin integration patch

 ibus-pinyin.spec |   20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)
---
diff --git a/ibus-pinyin.spec b/ibus-pinyin.spec
index c1247d4..577e413 100644
--- a/ibus-pinyin.spec
+++ b/ibus-pinyin.spec
@@ -1,16 +1,13 @@
 Name:       ibus-pinyin
 Version:    1.4.0
-Release:    16%{?dist}
+Release:    17%{?dist}
 Summary:    The Chinese Pinyin and Bopomofo engines for IBus input platform
 License:    GPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:    http://ibus.googlecode.com/files/pinyin-database-1.2.99.tar.bz2
-Source2:    pinyin.xml
-Source3:    ibus-engine-pinyin.py
-Patch0:     ibus-pinyin-libpinyin-integration.patch
-#Patch1:     ibus-pinyin-xx-icon-symbol.patch
+Patch1:     ibus-pinyin-xx-icon-symbol.patch
 
 BuildRequires:  gettext-devel
 BuildRequires:  intltool
@@ -21,13 +18,12 @@ BuildRequires:  libuuid-devel
 BuildRequires:  ibus-devel >= 1.3
 BuildRequires:  lua-devel >= 5.1
 BuildRequires:  opencc-devel
-BuildRequires:  libpinyin-devel >= 0.5.0
-Requires:       libpinyin >= 0.5.0
 
 # Requires(post): sqlite
 
 Requires:   ibus >= 1.2.0
 Requires:   ibus-pinyin-db
+Requires:   ibus-libpinyin
 
 %description
 The Chinese Pinyin and Bopomof input methods for IBus platform.
@@ -55,8 +51,7 @@ The phrase database for ibus Pinyin and Bopomofo from android project.
 
 %prep
 %setup -q
-%patch0 -p1 -b .integration
-#%patch1 -p1 -b .xx-icon
+%patch1 -p1 -b .xx-icon
 cp %{SOURCE1} data/db/open-phrase
 
 %build
@@ -70,8 +65,6 @@ make %{?_smp_mflags}
 
 %install
 make DESTDIR=${RPM_BUILD_ROOT} install
-install -c -m 0644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/ibus/component/pinyin.xml
-install -c -m 0755 %{SOURCE3} ${RPM_BUILD_ROOT}%{_libexecdir}/ibus-engine-pinyin.py
 
 %find_lang %{name}
 
@@ -80,9 +73,7 @@ install -c -m 0755 %{SOURCE3} ${RPM_BUILD_ROOT}%{_libexecdir}/ibus-engine-pinyin
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %{_libexecdir}/ibus-engine-pinyin
-%{_libexecdir}/ibus-engine-pinyin.py*
 %{_libexecdir}/ibus-setup-pinyin
-%{_libexecdir}/ibus-setup-libpinyin
 %{_datadir}/ibus-pinyin/phrases.txt
 %{_datadir}/ibus-pinyin/icons
 %{_datadir}/ibus-pinyin/setup
@@ -102,6 +93,9 @@ install -c -m 0755 %{SOURCE3} ${RPM_BUILD_ROOT}%{_libexecdir}/ibus-engine-pinyin
 %{_datadir}/ibus-pinyin/db/android.db
 
 %changelog
+* Tue Jun 12 2012  Peng Wu <pwu at redhat.com> - 1.4.0-17
+- Remove the libpinyin integration patch
+
 * Thu Apr 12 2012  Peng Wu <pwu at redhat.com> - 1.4.0-16
 - Fixes commit method in libpinyin bopomofo editor