diff --git a/.gitignore b/.gitignore index 5660394..dd65949 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ m17n-db-1.6.1.tar.gz /m17n-db-1.7.0.tar.gz /inscript2-20160423.tar.gz /minglish.mim +/m17n-db-1.8.0RC.tar.gz diff --git a/m17n-db-1.6.5-number_pad_itrans-222634.patch b/m17n-db-1.6.5-number_pad_itrans-222634.patch index fd1d8e6..ca96024 100644 --- a/m17n-db-1.6.5-number_pad_itrans-222634.patch +++ b/m17n-db-1.6.5-number_pad_itrans-222634.patch @@ -1,6 +1,6 @@ -diff -urN m17n-db-1.6.5/MIM/as-itrans.mim m17n-db-1.6.5.new/MIM/as-itrans.mim ---- m17n-db-1.6.5/MIM/as-itrans.mim 2013-05-23 18:22:04.000000000 +0530 -+++ m17n-db-1.6.5.new/MIM/as-itrans.mim 2014-01-27 19:43:43.608461146 +0530 +diff -urN MIM/as-itrans.mim.old MIM/as-itrans.mim +--- MIM/as-itrans.mim.old 2013-05-23 18:22:04.000000000 +0530 ++++ MIM/as-itrans.mim 2014-01-27 19:43:43.608461146 +0530 @@ -142,6 +142,11 @@ ((KP_8) "৮") ((KP_9) "৯") @@ -13,9 +13,9 @@ diff -urN m17n-db-1.6.5/MIM/as-itrans.mim m17n-db-1.6.5.new/MIM/as-itrans.mim ((S-\ ) "‌") ((C-@) "‍")) -diff -urN m17n-db-1.6.5/MIM/gu-itrans.mim m17n-db-1.6.5.new/MIM/gu-itrans.mim ---- m17n-db-1.6.5/MIM/gu-itrans.mim 2013-05-23 18:22:04.000000000 +0530 -+++ m17n-db-1.6.5.new/MIM/gu-itrans.mim 2014-01-27 19:44:15.069380103 +0530 +diff -urN MIM/gu-itrans.mim.old MIM/gu-itrans.mim +--- MIM/gu-itrans.mim.old 2013-05-23 18:22:04.000000000 +0530 ++++ MIM/gu-itrans.mim 2014-01-27 19:44:15.069380103 +0530 @@ -143,6 +143,11 @@ ((KP_8) "૮") ((KP_9) "૯") @@ -28,9 +28,9 @@ diff -urN m17n-db-1.6.5/MIM/gu-itrans.mim m17n-db-1.6.5.new/MIM/gu-itrans.mim ((S-\ ) "‌") ; not in ITRANS Gujarati table ((C-@) "‍")) ; not in ITRANS Gujarati table -diff -urN m17n-db-1.6.5/MIM/hi-itrans.mim m17n-db-1.6.5.new/MIM/hi-itrans.mim ---- m17n-db-1.6.5/MIM/hi-itrans.mim 2013-11-09 14:48:20.000000000 +0530 -+++ m17n-db-1.6.5.new/MIM/hi-itrans.mim 2014-01-27 19:50:10.952215133 +0530 +diff -urN MIM/hi-itrans.mim.old MIM/hi-itrans.mim +--- MIM/hi-itrans.mim.old 2013-11-09 14:48:20.000000000 +0530 ++++ MIM/hi-itrans.mim 2014-01-27 19:50:10.952215133 +0530 @@ -229,7 +229,12 @@ ((KP_6) "६") ((KP_7) "७") @@ -45,9 +45,9 @@ diff -urN m17n-db-1.6.5/MIM/hi-itrans.mim m17n-db-1.6.5.new/MIM/hi-itrans.mim (dependent ("a" (delete @-) "") -diff -urN m17n-db-1.6.5/MIM/kn-itrans.mim m17n-db-1.6.5.new/MIM/kn-itrans.mim ---- m17n-db-1.6.5/MIM/kn-itrans.mim 2014-01-27 19:51:21.086953700 +0530 -+++ m17n-db-1.6.5.new/MIM/kn-itrans.mim 2014-01-27 19:47:10.035916349 +0530 +diff -urN MIM/kn-itrans.mim.old MIM/kn-itrans.mim +--- MIM/kn-itrans.mim.old 2014-01-27 19:51:21.086953700 +0530 ++++ MIM/kn-itrans.mim 2014-01-27 19:47:10.035916349 +0530 @@ -251,6 +251,11 @@ ((KP_8) "೮") ((KP_9) "೯") @@ -60,9 +60,9 @@ diff -urN m17n-db-1.6.5/MIM/kn-itrans.mim m17n-db-1.6.5.new/MIM/kn-itrans.mim ((S-\ ) "‌") ; not in ITRANS Kannada table ((C-@) "‍")) ; not in ITRANS Kannada table -diff -urN m17n-db-1.6.5/MIM/ml-itrans.mim m17n-db-1.6.5.new/MIM/ml-itrans.mim ---- m17n-db-1.6.5/MIM/ml-itrans.mim 2013-05-23 18:22:04.000000000 +0530 -+++ m17n-db-1.6.5.new/MIM/ml-itrans.mim 2014-01-27 19:46:50.472981057 +0530 +diff -urN MIM/ml-itrans.mim.old MIM/ml-itrans.mim +--- MIM/ml-itrans.mim.old 2013-05-23 18:22:04.000000000 +0530 ++++ MIM/ml-itrans.mim 2014-01-27 19:46:50.472981057 +0530 @@ -175,6 +175,11 @@ ((KP_8) "൮") ((KP_9) "൯") @@ -75,9 +75,9 @@ diff -urN m17n-db-1.6.5/MIM/ml-itrans.mim m17n-db-1.6.5.new/MIM/ml-itrans.mim ((S-\ ) "‌") ((C-@) "‍")) -diff -urN m17n-db-1.6.5/MIM/or-itrans.mim m17n-db-1.6.5.new/MIM/or-itrans.mim ---- m17n-db-1.6.5/MIM/or-itrans.mim 2013-05-23 18:22:04.000000000 +0530 -+++ m17n-db-1.6.5.new/MIM/or-itrans.mim 2014-01-27 19:46:33.923023456 +0530 +diff -urN MIM/or-itrans.mim.old MIM/or-itrans.mim +--- MIM/or-itrans.mim.old 2013-05-23 18:22:04.000000000 +0530 ++++ MIM/or-itrans.mim 2014-01-27 19:46:33.923023456 +0530 @@ -143,6 +143,11 @@ ((KP_8) "୮") ((KP_9) "୯") @@ -90,9 +90,9 @@ diff -urN m17n-db-1.6.5/MIM/or-itrans.mim m17n-db-1.6.5.new/MIM/or-itrans.mim ((S-\ ) "‌") ((C-@) "‍")) -diff -urN m17n-db-1.6.5/MIM/pa-itrans.mim m17n-db-1.6.5.new/MIM/pa-itrans.mim ---- m17n-db-1.6.5/MIM/pa-itrans.mim 2013-05-23 18:22:04.000000000 +0530 -+++ m17n-db-1.6.5.new/MIM/pa-itrans.mim 2014-01-27 19:46:13.724075235 +0530 +diff -urN MIM/pa-itrans.mim.old MIM/pa-itrans.mim +--- MIM/pa-itrans.mim.old 2013-05-23 18:22:04.000000000 +0530 ++++ MIM/pa-itrans.mim 2014-01-27 19:46:13.724075235 +0530 @@ -136,6 +136,11 @@ ((KP_8) "੮") ((KP_9) "੯") @@ -105,9 +105,9 @@ diff -urN m17n-db-1.6.5/MIM/pa-itrans.mim m17n-db-1.6.5.new/MIM/pa-itrans.mim ((S-\ ) "‌") ; not in ITRANS Gurmukhi table ((C-@) "‍")) ; not in ITRANS Gurmukhi table -diff -urN m17n-db-1.6.5/MIM/ta-itrans.mim m17n-db-1.6.5.new/MIM/ta-itrans.mim ---- m17n-db-1.6.5/MIM/ta-itrans.mim 2013-05-23 18:22:04.000000000 +0530 -+++ m17n-db-1.6.5.new/MIM/ta-itrans.mim 2014-01-27 19:45:52.657129275 +0530 +diff -urN MIM/ta-itrans.mim.old MIM/ta-itrans.mim +--- MIM/ta-itrans.mim.old 2013-05-23 18:22:04.000000000 +0530 ++++ MIM/ta-itrans.mim 2014-01-27 19:45:52.657129275 +0530 @@ -130,6 +130,11 @@ ((KP_8) "௮") ((KP_9) "௯") @@ -120,9 +120,9 @@ diff -urN m17n-db-1.6.5/MIM/ta-itrans.mim m17n-db-1.6.5.new/MIM/ta-itrans.mim ((S-\ ) "‌") ; not in ITRANS Tamil table ((C-@) "‍") ; not in ITRANS Tamil table ("SRI" "ஶ்ரீ")) -diff -urN m17n-db-1.6.5/MIM/te-itrans.mim m17n-db-1.6.5.new/MIM/te-itrans.mim ---- m17n-db-1.6.5/MIM/te-itrans.mim 2013-05-23 18:22:04.000000000 +0530 -+++ m17n-db-1.6.5.new/MIM/te-itrans.mim 2014-01-27 19:44:51.452286491 +0530 +diff -urN MIM/te-itrans.mim.old MIM/te-itrans.mim +--- MIM/te-itrans.mim.old 2013-05-23 18:22:04.000000000 +0530 ++++ MIM/te-itrans.mim 2014-01-27 19:44:51.452286491 +0530 @@ -146,6 +146,11 @@ ((KP_8) "౮") ((KP_9) "౯") diff --git a/m17n-db-1.7.0-fix-e-o-mappings.patch b/m17n-db-1.7.0-fix-e-o-mappings.patch index 2221aa2..3ad48bb 100644 --- a/m17n-db-1.7.0-fix-e-o-mappings.patch +++ b/m17n-db-1.7.0-fix-e-o-mappings.patch @@ -1,6 +1,6 @@ -diff -urN m17n-db-1.7.0.old/MIM/gu-itrans.mim m17n-db-1.7.0/MIM/gu-itrans.mim ---- m17n-db-1.7.0/MIM/gu-itrans.mim 2015-08-24 22:30:15.723875911 +0530 -+++ m17n-db-1.7.0.new/MIM/gu-itrans.mim 2015-08-24 22:32:56.198910959 +0530 +diff -urN MIM/gu-itrans.mim.old MIM/gu-itrans.mim +--- MIM/gu-itrans.mim.old 2015-08-24 22:30:15.723875911 +0530 ++++ MIM/gu-itrans.mim 2015-08-24 22:32:56.198910959 +0530 @@ -166,11 +166,13 @@ ("RRI" (delete @-) "ૄ") ; not in ITRANS Gujarati table ("R^I" (delete @-) "ૄ") ; not in ITRANS Gujarati table diff --git a/m17n-db.spec b/m17n-db.spec index bc73ea8..936c887 100644 --- a/m17n-db.spec +++ b/m17n-db.spec @@ -1,12 +1,12 @@ Name: m17n-db Summary: Multilingualization datafiles for m17n-lib -Version: 1.7.0 -Release: 9%{?dist} +Version: 1.8.0 +Release: 0.1.RC1%{?dist} License: LGPLv2+ URL: http://www.nongnu.org/m17n -Source0: http://download-mirror.savannah.gnu.org/releases/m17n/%{name}-%{version}.tar.gz +Source0: http://download-mirror.savannah.gnu.org/releases/m17n/%{name}-%{version}RC.tar.gz ## Till the Inscript2 gets upstreamed in m17n-db, use this source -Source1: https://fedorahosted.org/releases/i/n/inscript2/inscript2-20160423.tar.gz +Source1: http://releases.pagure.org/inscript2/inscript2-20160423.tar.gz # Following is awaiting for upstream commit Source2: https://raw.githubusercontent.com/gnuman/m17n-inglish-mims/master/minglish/minglish.mim BuildArch: noarch @@ -47,45 +47,41 @@ m17n-db development files %prep -%setup -q -pushd MIM -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p2 -%patch4 -p2 -popd +%autosetup -p0 -n %{name}-%{version}RC ##extract inscript2 maps tar xzf %{SOURCE1} +# Following fixes https://bugzilla.redhat.com/show_bug.cgi?id=1487512 +sed -i 's/ ("ld" "སྡ")/ ("ld" "ལྡ")/g' MIM/bo-ewts.mim + %build %configure make %{?_smp_mflags} %install -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +make install DESTDIR=%{buildroot} INSTALL="install -p" # don't ship unijoy map for now -rm $RPM_BUILD_ROOT%{_datadir}/m17n/bn-unijoy.mim -rm $RPM_BUILD_ROOT%{_datadir}/m17n/icons/bn-unijoy.png +rm %{buildroot}%{_datadir}/m17n/bn-unijoy.mim +rm %{buildroot}%{_datadir}/m17n/icons/bn-unijoy.png #removing ispell.mim for rh#587927 -rm $RPM_BUILD_ROOT%{_datadir}/m17n/ispell.mim +rm %{buildroot}%{_datadir}/m17n/ispell.mim #install inscript2 keymaps -pwd -cp -p inscript2/IM/* $RPM_BUILD_ROOT%{_datadir}/m17n/ -cp -p inscript2/icons/* $RPM_BUILD_ROOT%{_datadir}/m17n/icons +cp -p inscript2/IM/* %{buildroot}%{_datadir}/m17n/ +cp -p inscript2/icons/* %{buildroot}%{_datadir}/m17n/icons # install minglish keymap -cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/m17n +cp -p %{SOURCE2} %{buildroot}%{_datadir}/m17n # For installing the translation files %find_lang %name %files -%doc AUTHORS COPYING README +%doc AUTHORS README +%license COPYING %dir %{_datadir}/m17n %{_datadir}/m17n/mdb.dir %{_datadir}/m17n/*.tbl @@ -136,6 +132,10 @@ cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/m17n %{_datadir}/pkgconfig/m17n-db.pc %changelog +* Wed Jan 03 2018 Parag Nemade - 1.8.0-0.1.RC1 +- Update to 1.8.0 (#1523967) +- Resolves:rh#1487512 - Can't enter words beginning "ld" with Tibetan-ewts keyboard + * Wed Jul 26 2017 Fedora Release Engineering - 1.7.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index 17bdcf1..a2bee05 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -0a320d3cf955abba459e51161fc91236 m17n-db-1.7.0.tar.gz -789a0db5def177ac01ba6d490aad7f92 inscript2-20160423.tar.gz -c456a47a9c240664e372c30f3810762b minglish.mim +SHA512 (m17n-db-1.8.0RC.tar.gz) = 8428392f0e7622742755c64123ab3b52cdfa460d4119c798243ea3806a666d1599a97bd8f10756a8818aa029de590b876df656a23b04487babd9012b41391e6a