diff --git a/.gitignore b/.gitignore index 6ccfd8d..0a8650e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /ibus-table-others-1.3.0.20100907.tar.gz +/ibus-table-others-1.3.0.20120912.tar.gz 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 deleted file mode 100644 index 1f511ae..0000000 --- a/ibus-table-others-1.3.0.20100907-fix-emoji-build.patch +++ /dev/null @@ -1,12 +0,0 @@ -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-1.3.0.20100907-fix-ipa-x-sampa-icon.patch b/ibus-table-others-1.3.0.20100907-fix-ipa-x-sampa-icon.patch deleted file mode 100644 index 125ebec..0000000 Binary files a/ibus-table-others-1.3.0.20100907-fix-ipa-x-sampa-icon.patch and /dev/null differ diff --git a/ibus-table-others-1.3.0.20100907-icons-russian-and-ukrainian-unique.patch b/ibus-table-others-1.3.0.20100907-icons-russian-and-ukrainian-unique.patch deleted file mode 100644 index b4fbbb2..0000000 --- a/ibus-table-others-1.3.0.20100907-icons-russian-and-ukrainian-unique.patch +++ /dev/null @@ -1,477 +0,0 @@ -From 0c9d7f4bcb870a8a1af9b26fffd026e75c38c8c1 Mon Sep 17 00:00:00 2001 -From: Daniil Ivanov -Date: Sat, 8 Sep 2012 13:27:31 +0300 -Subject: [PATCH 2/2] PNG icons for Russian and Ukrainian replaced with - updated SVG versions - ---- - ibus-table-others.spec | 4 +-- - ibus-table-others.spec.in | 4 +-- - icons/Makefile | 8 ++--- - icons/Makefile.am | 8 ++--- - icons/Makefile.in | 8 ++--- - icons/translit-ua.png | Bin 2658 -> 0 bytes - icons/translit-ua.svg | 90 ++++++++++++++++++++++++++++++++++++++++++++++ - icons/translit.png | Bin 2658 -> 0 bytes - icons/translit.svg | 89 +++++++++++++++++++++++++++++++++++++++++++++ - tables/translit-ua.txt | 2 +- - tables/translit.txt | 2 +- - 11 files changed, 197 insertions(+), 18 deletions(-) - delete mode 100644 icons/translit-ua.png - create mode 100644 icons/translit-ua.svg - delete mode 100644 icons/translit.png - create mode 100644 icons/translit.svg - -diff --git a/ibus-table-others.spec b/ibus-table-others.spec -index 849796c..4984c1c 100644 ---- a/ibus-table-others.spec -+++ b/ibus-table-others.spec -@@ -49,8 +49,8 @@ rm -rf $RPM_BUILD_ROOT - %files - %defattr(-,root,root,-) - %doc AUTHORS COPYING README --%{_datadir}/ibus-table/icons/translit.png --%{_datadir}/ibus-table/icons/translit-ua.png -+%{_datadir}/ibus-table/icons/translit.svg -+%{_datadir}/ibus-table/icons/translit-ua.svg - %{_datadir}/ibus-table/icons/rustrad.png - %{_datadir}/ibus-table/icons/yawerty.png - %{_datadir}/ibus-table/tables/translit.db -diff --git a/ibus-table-others.spec.in b/ibus-table-others.spec.in -index 87ca595..1c653cf 100644 ---- a/ibus-table-others.spec.in -+++ b/ibus-table-others.spec.in -@@ -49,8 +49,8 @@ rm -rf $RPM_BUILD_ROOT - %files - %defattr(-,root,root,-) - %doc AUTHORS COPYING README --%{_datadir}/ibus-table/icons/translit.png --%{_datadir}/ibus-table/icons/translit-ua.png -+%{_datadir}/ibus-table/icons/translit.svg -+%{_datadir}/ibus-table/icons/translit-ua.svg - %{_datadir}/ibus-table/icons/rustrad.png - %{_datadir}/ibus-table/icons/yawerty.png - %{_datadir}/ibus-table/tables/translit.db -diff --git a/icons/Makefile b/icons/Makefile -index ed1ef0c..db4cc99 100644 ---- a/icons/Makefile -+++ b/icons/Makefile -@@ -54,8 +54,8 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - am__append_1 = compose.svg - am__append_2 = ipa-x-sampa.svg --am__append_3 = translit.png --am__append_4 = translit-ua.png -+am__append_3 = translit.svg -+am__append_4 = translit-ua.svg - am__append_5 = rustrad.png - am__append_6 = yawerty.png - am__append_7 = thai.png -@@ -193,8 +193,8 @@ iconsdir = $(datadir)/ibus-table/icons - EXTRA_DIST = \ - compose.svg \ - ipa-x-sampa.svg \ -- translit.png \ -- translit-ua.png \ -+ translit.svg \ -+ translit-ua.svg \ - rustrad.png \ - yawerty.png \ - thai.png \ -diff --git a/icons/Makefile.am b/icons/Makefile.am -index e52599b..e8658b7 100644 ---- a/icons/Makefile.am -+++ b/icons/Makefile.am -@@ -29,11 +29,11 @@ icons_DATA += ipa-x-sampa.svg - endif - - if IBUS_TABLE_BUILD_TRANSLIT --icons_DATA += translit.png -+icons_DATA += translit.svg - endif - - if IBUS_TABLE_BUILD_TRANSLITUA --icons_DATA += translit-ua.png -+icons_DATA += translit-ua.svg - endif - - if IBUS_TABLE_BUILD_RUSTRAD -@@ -75,8 +75,8 @@ iconsdir = $(datadir)/ibus-table/icons - EXTRA_DIST = \ - compose.svg \ - ipa-x-sampa.svg \ -- translit.png \ -- translit-ua.png \ -+ translit.svg \ -+ translit-ua.svg \ - rustrad.png \ - yawerty.png \ - thai.png \ -diff --git a/icons/Makefile.in b/icons/Makefile.in -index eb40290..f22e8da 100644 ---- a/icons/Makefile.in -+++ b/icons/Makefile.in -@@ -54,8 +54,8 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - @IBUS_TABLE_BUILD_COMPOSE_TRUE@am__append_1 = compose.svg - @IBUS_TABLE_BUILD_IPAXSAMPA_TRUE@am__append_2 = ipa-x-sampa.svg --@IBUS_TABLE_BUILD_TRANSLIT_TRUE@am__append_3 = translit.png --@IBUS_TABLE_BUILD_TRANSLITUA_TRUE@am__append_4 = translit-ua.png -+@IBUS_TABLE_BUILD_TRANSLIT_TRUE@am__append_3 = translit.svg -+@IBUS_TABLE_BUILD_TRANSLITUA_TRUE@am__append_4 = translit-ua.svg - @IBUS_TABLE_BUILD_RUSTRAD_TRUE@am__append_5 = rustrad.png - @IBUS_TABLE_BUILD_YAWERTY_TRUE@am__append_6 = yawerty.png - @IBUS_TABLE_BUILD_THAI_TRUE@am__append_7 = thai.png -@@ -193,8 +193,8 @@ iconsdir = $(datadir)/ibus-table/icons - EXTRA_DIST = \ - compose.svg \ - ipa-x-sampa.svg \ -- translit.png \ -- translit-ua.png \ -+ translit.svg \ -+ translit-ua.svg \ - rustrad.png \ - yawerty.png \ - thai.png \ -diff --git a/icons/translit-ua.png b/icons/translit-ua.png -deleted file mode 100644 -index aeb56285fa68535606788d3ce40010901089b085..0000000000000000000000000000000000000000 -GIT binary patch -literal 0 -HcmV?d00001 - -literal 2658 -zcmV-o3Z31LtnQlM=}N_H!8u@$QYRcNJNExkhm -zRYHObF3=*7QqV5qq8D5&S2TM8H6EG?vQ6VasG#!ktHJ@$CU^Zj+socH75 -zV$K-Hial7;K&+iKW-fkzI6GQ~(1m_%99L~9YwaB{z5R0=8 -zaSm%O)|&rg0Ib7UgS7)7*4Rw|BC;<4BzGtAaOLeiKtzOkz5W7F2Ly)mjXKF>lC`xpKK$@QmY0{QR5s}KdKhC#cpjOF31$w=Fq4}hH#5V;!~}^{ -zlF7+Qs@3Z8VsZVSfAc%vIeqSjKfLj&0cfMqk;NFjN$OFyu~Fvc#~*Y4{CWQM?YCLJ -zdlzHO_BI88nVA`m9XrPHIS1I));HQmVBtAv~k1M5S -zMI-|xlu~68xd!~5QtJ6?wR-xYhaSSls+aOpRwi;J -z{3PRJV{|$le)_=&gATws6pHcjF@hlYf{5gSOw5OW1J*|Z7_Pd}8eoXxEpqMJb#C6gNu^RD3<6M! -zY&Og6>@2ghvt%-vxRoE&8)FP=AW0sOQc6t$(<1USz>Sd+7#=!4Mggd;7jpel@kiNg -z_COeh6bc0v7Z>^WOP9EC;qO^lUfHpmee|o3^7XGh&DfZ~WlwU?^OT6BfN7=F&x**6 -z(Hs~OIBqH22of(XF1?VS%OC3Z`xMvKxP9ji*REgZ_4DUhUtbsCFM)GPsgJ@i>0bNRWOekzGlYNy+)SiRCpsl14cQlU5k+F;yZ^{v~zmALuw(yu3y35+%rR#&Oj -zYLwR3SzliVINJ)%ANiOAz#~8oNCU}3hYlS(b?Ov}M1n93(OT~aB96k;XcAkuB?5a( -zp=!1Em2$a^F_uoJjn*2aRJ=8H|KMYOHGcSHOiUk0%+JrCnwy&=3`3$Q+HKRMfP{#s -z(aoGOXdPj!8Ej~_)PbF%&uuT}GW7@IY%K9ig=ySqEyh+LcPB -z@{PH}bEL=9c%DZ(ljchgJjlUZ?y)DHcrxE=H9yo^hlh_G$)0%Rk)KPYQrTj$NV#05 -z)9LIL!01YhfC&HH$k|~-w{sNM*VoV0>-BF~YnjeYGnJjh_s2;2KKc9{nM`Iblm7DD -zEH8nMR{P=Ok#>O^zbFVk3Jp*{@rI#|zRukeVIOi}{qa!_x -zj=evLtAEpIG=AsOyO*Ate{h~$E=M+-C7n()K0Z!5ohFq^(d+eCT3X_@*IvU~+Xa66 -z#EBEH4xnR=LL -z?Ufw>>@>`IUql{IN{z=+@V7XXiv36{rH1ziM5GNY0lyfZS38bXu3Wi7GMU5}L!;4P -zb#;}Ml@&HNHa7piapMN%av2f1Dk2;Aao)xI-FpUH@!tacL_|u!2G9ZeN+}&XYym4G -z5zvZ%cNw_jd0rFfDWw7++;$9}QmfUtbLS4jO4#jo>2|v`n@tLZ0!vFvlu9K;q-2cw -z+js@H64=I$^zS!Oi@$3DKUPXTB_aovQkgivJ*CtzU3wzYjkk?u;E;1}HI7Jf$2u@v -z`A(-pqtO_2kfjnUD=QQVg`s5pr?vJ6A~MX=&DB>*=~$UYnHG_M0a7AzG|qcpM66P( -zB_el$_SOjv@YYBba?TM&QJm{*EG{l``}Xaj<89z|t@VX1UF7!F4}j(;P(Kaayx*MY -zlbQm^X0z{wVfc8Qn+;&yIad{to6fmwfEN#F$F~v60lj$M^An)>zdfB+yPW&2c(XAU -zJH1uTWcXe{DOD4Z0`TK~HC~VBHe*{PZ@c2?IBzS!+xzbQK)mBo+w$GTIp2@vt_r-n -zjd=U#1;-Yrol?q(NEqjQ3#bC`#9;R48=6?3ZLAvISk?-_`@=%=xqU|aF9Afs2OGhh -QasU7T07*qoM6N<$f^3f=WB>pF - -diff --git a/icons/translit-ua.svg b/icons/translit-ua.svg -new file mode 100644 -index 0000000..78edf16 ---- /dev/null -+++ b/icons/translit-ua.svg -@@ -0,0 +1,90 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ image/svg+xml -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/icons/translit.png b/icons/translit.png -deleted file mode 100644 -index aeb56285fa68535606788d3ce40010901089b085..0000000000000000000000000000000000000000 -GIT binary patch -literal 0 -HcmV?d00001 - -literal 2658 -zcmV-o3Z31LtnQlM=}N_H!8u@$QYRcNJNExkhm -zRYHObF3=*7QqV5qq8D5&S2TM8H6EG?vQ6VasG#!ktHJ@$CU^Zj+socH75 -zV$K-Hial7;K&+iKW-fkzI6GQ~(1m_%99L~9YwaB{z5R0=8 -zaSm%O)|&rg0Ib7UgS7)7*4Rw|BC;<4BzGtAaOLeiKtzOkz5W7F2Ly)mjXKF>lC`xpKK$@QmY0{QR5s}KdKhC#cpjOF31$w=Fq4}hH#5V;!~}^{ -zlF7+Qs@3Z8VsZVSfAc%vIeqSjKfLj&0cfMqk;NFjN$OFyu~Fvc#~*Y4{CWQM?YCLJ -zdlzHO_BI88nVA`m9XrPHIS1I));HQmVBtAv~k1M5S -zMI-|xlu~68xd!~5QtJ6?wR-xYhaSSls+aOpRwi;J -z{3PRJV{|$le)_=&gATws6pHcjF@hlYf{5gSOw5OW1J*|Z7_Pd}8eoXxEpqMJb#C6gNu^RD3<6M! -zY&Og6>@2ghvt%-vxRoE&8)FP=AW0sOQc6t$(<1USz>Sd+7#=!4Mggd;7jpel@kiNg -z_COeh6bc0v7Z>^WOP9EC;qO^lUfHpmee|o3^7XGh&DfZ~WlwU?^OT6BfN7=F&x**6 -z(Hs~OIBqH22of(XF1?VS%OC3Z`xMvKxP9ji*REgZ_4DUhUtbsCFM)GPsgJ@i>0bNRWOekzGlYNy+)SiRCpsl14cQlU5k+F;yZ^{v~zmALuw(yu3y35+%rR#&Oj -zYLwR3SzliVINJ)%ANiOAz#~8oNCU}3hYlS(b?Ov}M1n93(OT~aB96k;XcAkuB?5a( -zp=!1Em2$a^F_uoJjn*2aRJ=8H|KMYOHGcSHOiUk0%+JrCnwy&=3`3$Q+HKRMfP{#s -z(aoGOXdPj!8Ej~_)PbF%&uuT}GW7@IY%K9ig=ySqEyh+LcPB -z@{PH}bEL=9c%DZ(ljchgJjlUZ?y)DHcrxE=H9yo^hlh_G$)0%Rk)KPYQrTj$NV#05 -z)9LIL!01YhfC&HH$k|~-w{sNM*VoV0>-BF~YnjeYGnJjh_s2;2KKc9{nM`Iblm7DD -zEH8nMR{P=Ok#>O^zbFVk3Jp*{@rI#|zRukeVIOi}{qa!_x -zj=evLtAEpIG=AsOyO*Ate{h~$E=M+-C7n()K0Z!5ohFq^(d+eCT3X_@*IvU~+Xa66 -z#EBEH4xnR=LL -z?Ufw>>@>`IUql{IN{z=+@V7XXiv36{rH1ziM5GNY0lyfZS38bXu3Wi7GMU5}L!;4P -zb#;}Ml@&HNHa7piapMN%av2f1Dk2;Aao)xI-FpUH@!tacL_|u!2G9ZeN+}&XYym4G -z5zvZ%cNw_jd0rFfDWw7++;$9}QmfUtbLS4jO4#jo>2|v`n@tLZ0!vFvlu9K;q-2cw -z+js@H64=I$^zS!Oi@$3DKUPXTB_aovQkgivJ*CtzU3wzYjkk?u;E;1}HI7Jf$2u@v -z`A(-pqtO_2kfjnUD=QQVg`s5pr?vJ6A~MX=&DB>*=~$UYnHG_M0a7AzG|qcpM66P( -zB_el$_SOjv@YYBba?TM&QJm{*EG{l``}Xaj<89z|t@VX1UF7!F4}j(;P(Kaayx*MY -zlbQm^X0z{wVfc8Qn+;&yIad{to6fmwfEN#F$F~v60lj$M^An)>zdfB+yPW&2c(XAU -zJH1uTWcXe{DOD4Z0`TK~HC~VBHe*{PZ@c2?IBzS!+xzbQK)mBo+w$GTIp2@vt_r-n -zjd=U#1;-Yrol?q(NEqjQ3#bC`#9;R48=6?3ZLAvISk?-_`@=%=xqU|aF9Afs2OGhh -QasU7T07*qoM6N<$f^3f=WB>pF - -diff --git a/icons/translit.svg b/icons/translit.svg -new file mode 100644 -index 0000000..c034b87 ---- /dev/null -+++ b/icons/translit.svg -@@ -0,0 +1,89 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ image/svg+xml -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/tables/translit-ua.txt b/tables/translit-ua.txt -index 5af3917..e533dd4 100644 ---- a/tables/translit-ua.txt -+++ b/tables/translit-ua.txt -@@ -23,7 +23,7 @@ UUID = 9068f86e-02b5-400b-9732-4f9433ac9968 - ### This number must be less than 2^32. - SERIAL_NUMBER = 20120906 - --ICON = translit-ua.png -+ICON = translit-ua.svg - - ### The default name of this table - NAME = Ua-Translit -diff --git a/tables/translit.txt b/tables/translit.txt -index 11d6425..da3ec62 100644 ---- a/tables/translit.txt -+++ b/tables/translit.txt -@@ -21,7 +21,7 @@ UUID = e39c975a-262b-4ad3-b9b8-15c5ff211e4e - ### This number must be less than 2^32. - SERIAL_NUMBER = 20120906 - --ICON = translit.png -+ICON = translit.svg - - ### The default name of this table - NAME = Translit --- -1.7.11.4 - diff --git a/ibus-table-others-1.3.0.20100907-improve-translit.patch b/ibus-table-others-1.3.0.20100907-improve-translit.patch deleted file mode 100644 index d4bc7c8..0000000 --- a/ibus-table-others-1.3.0.20100907-improve-translit.patch +++ /dev/null @@ -1,189 +0,0 @@ -diff -ru ibus-table-others-1.3.0.20100907.orig/tables/translit-ua.txt ibus-table-others-1.3.0.20100907/tables/translit-ua.txt ---- ibus-table-others-1.3.0.20100907.orig/tables/translit-ua.txt 2010-09-07 10:59:19.000000000 +0200 -+++ ibus-table-others-1.3.0.20100907/tables/translit-ua.txt 2012-09-06 12:43:43.682230229 +0200 -@@ -1,6 +1,13 @@ --### File header must not be modified -+### Table Translit Table -+### -+### Author Daniil Ivanov -+### Maintainer Caius 'kaio' Chance < k at kaio.me > -+### -+### Description Translit Table for IBus-Table. This file is derived from -+### SCIM Tables format, which is derived from GTK2 Input Method -+### Cyrillic (Transliterated). -+### - ### This file must be encoded into UTF-8. --### This file is derived from GTK2 Input Method Cyrillic Transliterated - SCIM_Generic_Table_Phrase_Library_TEXT - VERSION_1_0 - -@@ -14,7 +21,7 @@ - ### A unique number indicates the version of this file. - ### For example the last modified date of this file. - ### This number must be less than 2^32. --SERIAL_NUMBER = 20061108 -+SERIAL_NUMBER = 20120906 - - ICON = translit-ua.png - -@@ -34,7 +41,7 @@ - STATUS_PROMPT = Ua - - ### The Keyboard Layout used by this table. Unset or set to "Unknown" to accept any kind of layouts. --KEYBOARD_LAYOUT = US_Default -+KEYBOARD_LAYOUT = Unknown - - ### If true then the first candidate phrase - ### will be selected automatically during inputing. -@@ -121,6 +128,8 @@ - I І 0 - Ji Ї 0 - JI Ї 0 -+Yi Ї 0 -+YI Ї 0 - Y И 0 - J Й 0 - K К 0 -@@ -140,13 +149,21 @@ - Ch Ч 0 - Sh Ш 0 - SH Ш 0 -+W Ш 0 -+Shh Щ 0 -+SHH Щ 0 - Sj Щ 0 - SJ Щ 0 - '' Ь 0 --JU Ю 0 - Ju Ю 0 -+JU Ю 0 -+Yu Ю 0 -+YU Ю 0 - Ja Я 0 - JA Я 0 -+Ya Я 0 -+YA Я 0 -+Q Я 0 - " ' 0 - a а 0 - b б 0 -@@ -160,6 +177,7 @@ - z з 0 - i і 0 - ji ї 0 -+yi ї 0 - y и 0 - j й 0 - k к 0 -@@ -177,8 +195,13 @@ - c ц 0 - ch ч 0 - sh ш 0 -+w ш 0 -+shh щ 0 - sj щ 0 - ' ь 0 - ju ю 0 -+yu ю 0 - ja я 0 -+ya я 0 -+q я 0 - END_TABLE -ibus-table-others-1.3.0.20100907/tablesだけに発見: translit-ua.txt.~1~ -diff -ru ibus-table-others-1.3.0.20100907.orig/tables/translit.txt ibus-table-others-1.3.0.20100907/tables/translit.txt ---- ibus-table-others-1.3.0.20100907.orig/tables/translit.txt 2010-09-07 10:59:19.000000000 +0200 -+++ ibus-table-others-1.3.0.20100907/tables/translit.txt 2012-09-06 12:30:42.831463558 +0200 -@@ -19,7 +19,7 @@ - ### A unique number indicates the version of this file. - ### For example the last modified date of this file. - ### This number must be less than 2^32. --SERIAL_NUMBER = 20100111 -+SERIAL_NUMBER = 20120906 - - ICON = translit.png - -@@ -39,7 +39,7 @@ - STATUS_PROMPT = Я - - ### The Keyboard Layout used by this table. Unset or set to "Unknown" to accept any kind of layouts. --KEYBOARD_LAYOUT = US_Default -+KEYBOARD_LAYOUT = Unknown - - ### If true then the first candidate phrase - ### will be selected automatically during inputing. -@@ -82,7 +82,7 @@ - MAX_KEY_LENGTH = 2 - - ### Valid input chars. --VALID_INPUT_CHARS = ABCDEFGHIJKLMNOPRSTUVWYZabcdefghijklmnopqrstuvwxyzäöü'"# -+VALID_INPUT_CHARS = ABCDEFGHIJKLMNOPRSTUVWYZÄÖÜabcdefghijklmnopqrstuvwxyzäöü'# - - ### Single wildcard char, can have multiple chars. - ###SINGLE_WILDCARD_CHAR = ? -@@ -119,7 +119,12 @@ - D Д 1000 - E Е 1000 - Jo Ё 1000 -+JO Ё 1000 -+Yo Ё 1000 -+YO Ё 1000 -+Ö Ё 1000 - Zh Ж 1000 -+ZH Ж 1000 - Z З 1000 - I И 1000 - J Й 1000 -@@ -135,16 +140,35 @@ - U У 1000 - F Ф 1000 - H Х 1000 -+X Х 1000 - C Ц 1000 - Ch Ч 1000 -+CH Ч 1000 - Sh Ш 1000 --W Щ 1000 -+SH Ш 1000 -+W Ш 1000 -+Shh Щ 1000 -+SHh Щ 1000 -+SHH Щ 1000 -+Sj Щ 1000 -+SJ Щ 1000 - ## Ъ 1000 - Y Ы 1000 --" Ь 1000 -+'' Ь 1000 - Je Э 1000 -+JE Э 1000 -+Ä Э 1000 -+E' Э 1000 - Ju Ю 1000 -+JU Ю 1000 -+Yu Ю 1000 -+YU Ю 1000 -+Ü Ю 1000 - Ja Я 1000 -+JA Я 1000 -+Ya Я 1000 -+YA Я 1000 -+Q Я 1000 - a а 1000 - b б 1000 - v в 1000 -@@ -174,12 +198,14 @@ - c ц 1000 - ch ч 1000 - sh ш 1000 --w щ 1000 -+w ш 1000 - shh щ 1000 -+sj щ 1000 - # ъ 1000 - y ы 1000 - ' ь 1000 - je э 1000 -+e' э 1000 - ä э 1000 - ju ю 1000 - yu ю 1000 diff --git a/ibus-table-others-1.3.0.20100907-status-prompt-ukrainian-and-russian-unique.patch b/ibus-table-others-1.3.0.20100907-status-prompt-ukrainian-and-russian-unique.patch deleted file mode 100644 index a2325ef..0000000 --- a/ibus-table-others-1.3.0.20100907-status-prompt-ukrainian-and-russian-unique.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0d3d5a4bee836c7338ba4140415e672959f1e507 Mon Sep 17 00:00:00 2001 -From: Daniil Ivanov -Date: Fri, 7 Sep 2012 17:08:49 +0300 -Subject: [PATCH 1/2] Change status prompt for Ukrainian and Russian - transliteration tables to make it unique - ---- - tables/translit-ua.txt | 2 +- - tables/translit.txt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tables/translit-ua.txt b/tables/translit-ua.txt -index 0eeb497..5af3917 100644 ---- a/tables/translit-ua.txt -+++ b/tables/translit-ua.txt -@@ -38,7 +38,7 @@ LANGUAGES = uk_UA - AUTHOR = Daniil Ivanov - - ### Prompt string to be displayed in the status area. --STATUS_PROMPT = Ua -+STATUS_PROMPT = Yi - - ### The Keyboard Layout used by this table. Unset or set to "Unknown" to accept any kind of layouts. - KEYBOARD_LAYOUT = Unknown -diff --git a/tables/translit.txt b/tables/translit.txt -index 9b4754b..11d6425 100644 ---- a/tables/translit.txt -+++ b/tables/translit.txt -@@ -36,7 +36,7 @@ LANGUAGES = ru_RU - AUTHOR = Daniil Ivanov - - ### Prompt string to be displayed in the status area. --STATUS_PROMPT = Я -+STATUS_PROMPT = Ya - - ### The Keyboard Layout used by this table. Unset or set to "Unknown" to accept any kind of layouts. - KEYBOARD_LAYOUT = Unknown --- -1.7.11.4 - diff --git a/ibus-table-others-1.3.0.20100907-table-language-empty.patch b/ibus-table-others-1.3.0.20100907-table-language-empty.patch deleted file mode 100644 index c5602bd..0000000 --- a/ibus-table-others-1.3.0.20100907-table-language-empty.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -ru ibus-table-others-1.3.0.20100907.orig/tables/compose.txt ibus-table-others-1.3.0.20100907/tables/compose.txt ---- ibus-table-others-1.3.0.20100907.orig/tables/compose.txt 2010-09-07 10:59:19.000000000 +0200 -+++ ibus-table-others-1.3.0.20100907/tables/compose.txt 2012-09-06 12:13:19.825902428 +0200 -@@ -33,7 +33,7 @@ - ### The local names of this table - - ### Supported languages of this table --LANGUAGES = -+LANGUAGES = other - - AUTHOR = Yu Yuwei - -diff -ru ibus-table-others-1.3.0.20100907.orig/tables/latex.txt ibus-table-others-1.3.0.20100907/tables/latex.txt ---- ibus-table-others-1.3.0.20100907.orig/tables/latex.txt 2010-09-07 10:59:19.000000000 +0200 -+++ ibus-table-others-1.3.0.20100907/tables/latex.txt 2012-09-06 12:13:08.544871559 +0200 -@@ -32,7 +32,7 @@ - AUTHOR = Somebody unknown - - ### Supported locales of this table --LANGUAGES = -+LANGUAGES = other - - ### Prompt string to be displayed in the status area. - STATUS_PROMPT = Σ -diff -ru ibus-table-others-1.3.0.20100907.orig/tables/mathwriter-ibus.txt ibus-table-others-1.3.0.20100907/tables/mathwriter-ibus.txt ---- ibus-table-others-1.3.0.20100907.orig/tables/mathwriter-ibus.txt 2010-09-07 10:59:19.000000000 +0200 -+++ ibus-table-others-1.3.0.20100907/tables/mathwriter-ibus.txt 2012-09-06 12:27:21.404925722 +0200 -@@ -8,7 +8,7 @@ - - NAME = mathwriter - --LANGUAGES = -+LANGUAGES = other - STATUS_PROMPT = Σ - - icon = mathwriter.png diff --git a/ibus-table-others.spec b/ibus-table-others.spec index 86de118..5dc691f 100644 --- a/ibus-table-others.spec +++ b/ibus-table-others.spec @@ -1,19 +1,13 @@ %global cur_ver 1.3.0.20100907 Name: ibus-table-others -Version: 1.3.0.20100907 -Release: 14%{?dist} +Version: 1.3.0.20120912 +Release: 1%{?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 -Patch1: ibus-table-others-1.3.0.20100907-improve-translit.patch -Patch2: ibus-table-others-1.3.0.20100907-table-language-empty.patch -Patch3: ibus-table-others-1.3.0.20100907-fix-ipa-x-sampa-icon.patch -Patch4: ibus-table-others-1.3.0.20100907-status-prompt-ukrainian-and-russian-unique.patch -Patch5: ibus-table-others-1.3.0.20100907-icons-russian-and-ukrainian-unique.patch +Source0: http://mfabian.fedorapeople.org/ibus-table-others/%{name}-%{version}.tar.gz BuildArch: noarch Requires: ibus-table @@ -68,12 +62,6 @@ The package contains table for writing Unicode mathematics symbols. %prep %setup -q -%patch0 -p1 -b .fix-emoji-build -%patch1 -p1 -b .improve-translit -%patch2 -p1 -b .table-language-empty -%patch3 -p1 -b .fix-ipa-x-sampa-icon -%patch4 -p1 -b .status-prompt-uk-ru-unique -%patch5 -p1 -b .icons-uk-ru-unique %build %configure @@ -136,6 +124,10 @@ cd ${RPM_BUILD_ROOT}/%{_datadir}/ibus-table/tables/ %{_datadir}/ibus-table/icons/mathwriter.png %changelog +* Wed Sep 12 2012 Mike FABIAN - 1.3.0.20120912-1 +- update to latest upstream 1.3.0.20120912 +- remove the patches already included upstream + * Mon Sep 10 2012 Mike FABIAN - 1.3.0.20100907-14 - Resolves: #855788 - Make the status prompts for Ukrainian and Russian unique diff --git a/sources b/sources index dab6e62..dcc6581 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -10a45a61ddcea5edb3dda79a5a855425 ibus-table-others-1.3.0.20100907.tar.gz +8fd2120af7c7c746da820e6d81f5f1a5 ibus-table-others-1.3.0.20120912.tar.gz