[ibus-table-others] Fix build for emoji-table and enable it again.

Mike FABIAN mfabian at fedoraproject.org
Wed Aug 29 13:32:01 UTC 2012


commit fe05fb5803d13c1d0f60729d96d4e585d09e6bc7
Author: Mike FABIAN <mfabian at redhat.com>
Date:   Wed Aug 29 14:45:52 2012 +0200

    Fix build for emoji-table and enable it again.
    
    - Resolves: #845797

 ...ble-others-1.3.0.20100907-fix-emoji-build.patch |   12 ++++++++++++
 ibus-table-others.spec                             |   16 +++++++++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)
---
diff --git a/ibus-table-others-1.3.0.20100907-fix-emoji-build.patch b/ibus-table-others-1.3.0.20100907-fix-emoji-build.patch
new file mode 100644
index 0000000..1f511ae
--- /dev/null
+++ b/ibus-table-others-1.3.0.20100907-fix-emoji-build.patch
@@ -0,0 +1,12 @@
+diff -up ibus-table-others-1.3.0.20100907/tables/emoji-table.txt.orig ibus-table-others-1.3.0.20100907/tables/emoji-table.txt
+--- ibus-table-others-1.3.0.20100907/tables/emoji-table.txt.orig	2010-09-07 10:59:19.000000000 +0200
++++ ibus-table-others-1.3.0.20100907/tables/emoji-table.txt	2012-08-27 17:45:07.944014109 +0200
+@@ -71,7 +71,7 @@ DEF_FULL_WIDTH_LETTER = FALSE
+ ### Whether user are allow to define phrase, default is true
+ ### You have to define the word construction rules below.
+ ### For input methods which do not input phrases, set this to False
+-USER_CAN_DEFINE_PHRASE = TRUE
++USER_CAN_DEFINE_PHRASE = FALSE
+ 
+ ### Whether support PinYin Mode, default is true.
+ ### this feature is just for Chinese, set it to False if your IM is not
diff --git a/ibus-table-others.spec b/ibus-table-others.spec
index 6dc65e9..30e51e1 100644
--- a/ibus-table-others.spec
+++ b/ibus-table-others.spec
@@ -2,12 +2,13 @@
 
 Name:       ibus-table-others
 Version:    1.3.0.20100907
-Release:    9%{?dist}
+Release:    10%{?dist}
 Summary:    Various tables for IBus-Table
 License:    GPLv3
 Group:      System Environment/Libraries
 URL:        http://github.com/moebiuscurve/ibus-table-others
 Source0:    http://nkumar.fedorapeople.org/ibus-table-others/%{name}-%{version}.tar.gz
+Patch0:     ibus-table-others-1.3.0.20100907-fix-emoji-build.patch
 BuildArch:  noarch
 
 Requires:         ibus-table
@@ -62,9 +63,10 @@ The package contains table for writing Unicode mathematics symbols.
 
 %prep
 %setup -q
+%patch0 -p1 -b .fix-emoji-build
 
 %build
-%configure --disable-emoji 
+%configure
 
 make %{?_smp_mflags}
 
@@ -73,7 +75,7 @@ make DESTDIR=${RPM_BUILD_ROOT} NO_INDEX=true install
 cd ${RPM_BUILD_ROOT}/%{_datadir}/ibus-table/tables/
 %{_bindir}/ibus-table-createdb -i -n cns11643.db
 %{_bindir}/ibus-table-createdb -i -n compose.db
-#%{_bindir}/ibus-table-createdb -i -n emoji-table.db
+%{_bindir}/ibus-table-createdb -i -n emoji-table.db
 %{_bindir}/ibus-table-createdb -i -n ipa-x-sampa.db
 %{_bindir}/ibus-table-createdb -i -n latex.db
 %{_bindir}/ibus-table-createdb -i -n rustrad.db
@@ -90,10 +92,10 @@ cd ${RPM_BUILD_ROOT}/%{_datadir}/ibus-table/tables/
 %files -n ibus-table-code
 %{_datadir}/ibus-table/tables/latex.db
 %{_datadir}/ibus-table/tables/cns11643.db
-#%{_datadir}/ibus-table/tables/emoji-table.db
+%{_datadir}/ibus-table/tables/emoji-table.db
 %{_datadir}/ibus-table/icons/latex.svg
 %{_datadir}/ibus-table/icons/cns11643.png
-#%{_datadir}/ibus-table/icons/ibus-emoji.svg
+%{_datadir}/ibus-table/icons/ibus-emoji.svg
 
 %files -n ibus-table-cyrillic
 %{_datadir}/ibus-table/tables/rustrad.db
@@ -124,6 +126,10 @@ cd ${RPM_BUILD_ROOT}/%{_datadir}/ibus-table/tables/
 %{_datadir}/ibus-table/icons/mathwriter.png
 
 %changelog
+* Wed Aug 29 2012 Mike FABIAN <mfabian at redhat.com> - 1.3.0.20100907-10
+- Fix build for emoji-table and enable it again.
+- Resolves: #845797
+
 * Sat Aug 04 2012 Parag Nemade <paragn AT fedoraproject DOT org> - 1.3.0.20100907-9
 - Save this package for f18 by blocking emoji-table 
 


More information about the scm-commits mailing list