[ibus-pinyin] Revert "obsoletes db-open-phrase"

[Peng Wu]

commit 8b917e146c7f38b3847b08774c5a889f33a03b12
Author: Peng Wu <alexepico at gmail.com>
Date:   Tue Jan 31 11:22:37 2012 +0800

    Revert "obsoletes db-open-phrase"
    
    This reverts commit d7560299f9c4518b18ee247f2c25864cf5fe77cb.

 ibus-pinyin.spec |   31 +++++++++++++++++++++++--------
 1 files changed, 23 insertions(+), 8 deletions(-)
---
diff --git a/ibus-pinyin.spec b/ibus-pinyin.spec
index 5932490..04dbf14 100644
--- a/ibus-pinyin.spec
+++ b/ibus-pinyin.spec
@@ -1,12 +1,12 @@
 Name:       ibus-pinyin
 Version:    1.4.0
-Release:    8%{?dist}
+Release:    7%{?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
+Source1:    http://ibus.googlecode.com/files/pinyin-database-1.2.99.tar.bz2
 Patch0:     ibus-pinyin-libpinyin-integration.patch
 Patch1:     ibus-pinyin-xx-icon-symbol.patch
 
@@ -24,7 +24,6 @@ BuildRequires:  lua-devel >= 5.1
 BuildRequires:  opencc-devel
 %endif
 BuildRequires:  libpinyin-devel
-Obsoletes:      ibus-pinyin-db-open-phrase
 
 # Requires(post): sqlite
 
@@ -34,6 +33,17 @@ Requires:   ibus-pinyin-db = %{version}-%{release}
 %description
 The Chinese Pinyin and Bopomof input methods for IBus platform.
 
+%package    db-open-phrase
+Summary:    The open phrase database for ibus Pinyin
+Group:      System Environment/Libraries
+BuildArch:  noarch
+Provides:   ibus-pinyin-db
+Obsoletes:  ibus-pinyin-open-phrase
+Requires(post): sqlite
+
+%description db-open-phrase
+The phrase database for ibus Pinyin and Bopomofo from open-phrase project.
+
 %package    db-android
 Summary:    The android phrase database for ibus Pinyin and Bopomofo
 Group:      System Environment/Libraries
@@ -48,11 +58,11 @@ The phrase database for ibus Pinyin and Bopomofo from android project.
 %setup -q
 %patch0 -p1 -b .integration
 %patch1 -p1 -b .xx-icon
-#cp %{SOURCE1} data/db/open-phrase
+cp %{SOURCE1} data/db/open-phrase
 
 %build
 autoreconf
-%configure --disable-static --disable-db-open-phrase \
+%configure --disable-static --enable-db-open-phrase \
 %ifarch i686 x86_64
            --enable-opencc \
 %endif
@@ -75,6 +85,10 @@ rm -rf $RPM_BUILD_ROOT
 # cd %{_datadir}/ibus-pinyin/db
 # sqlite3 android.db ".read create_index.sql"
 
+%post db-open-phrase
+# cd %{_datadir}/ibus-pinyin/db
+# sqlite3 open-phrase.db ".read create_index.sql"
+
 %post db-android
 # cd %{_datadir}/ibus-pinyin/db
 # sqlite3 android.db ".read create_index.sql"
@@ -94,14 +108,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus-pinyin/base.lua
 %{_datadir}/ibus-pinyin/db/english.db
 
+%files db-open-phrase
+%defattr(-,root,root,-)
+%{_datadir}/ibus-pinyin/db/open-phrase.db
+
 %files db-android
 %defattr(-,root,root,-)
 %{_datadir}/ibus-pinyin/db/android.db
 
 %changelog
-* Mon Jan 30 2012  Peng Wu <pwu at redhat.com> - 1.4.0-8
-- Removes and obsoletes ibus-pinyin-db-open-phrase
-
 * Mon Jan 30 2012  Peng Wu <pwu at redhat.com> - 1.4.0-7
 - Fixes Bopomofo Engine