.gitignore

@@ -1,2 +1,3 @@
 SOURCES/inscript2-20160423.tar.gz
 SOURCES/m17n-db-1.8.0.tar.gz
+SOURCES/m17n-db-sayura-1.0.0.tar.gz

.m17n-db.metadata

@@ -1,2 +1,3 @@
 ed1e419adb26fc79c1b3b9de8a3ac3a089e35b51 SOURCES/inscript2-20160423.tar.gz
 b314d22e726b06676f405ac1e06cad2823868bc3 SOURCES/m17n-db-1.8.0.tar.gz
+fe31c1a0a84af563ecc835b0633340fd99e81139 SOURCES/m17n-db-sayura-1.0.0.tar.gz

SOURCES/m17n-db-1.8.0-inscript2-mni-sat.patch

@@ -0,0 +1,60 @@
+--- inscript2/IM/mni-inscript2-beng.mim	2016-04-23 09:41:08.000000000 +0200
++++ inscript2/IM/mni-inscript2-beng.mim	2019-10-10 11:58:18.068555240 +0200
+@@ -18,7 +18,7 @@
+ ;;
+ ;; Author: Parag Nemade <pnemade@redhat.com>
+ 
+-(input-method mni inscript2)
++(input-method mni inscript2-beng)
+ 
+ (description "Manipuri input method for enhanced inscript layout.
+ 
+--- inscript2/IM/mni-inscript2-mtei.mim	2016-04-23 09:41:10.000000000 +0200
++++ inscript2/IM/mni-inscript2-mtei.mim	2019-10-10 11:58:18.069555230 +0200
+@@ -18,7 +18,7 @@
+ ;;
+ ;; Author: Parag Nemade <pnemade@redhat.com>
+ 
+-(input-method mni inscript2)
++(input-method mni inscript2-mtei)
+ 
+ (description "Manipuri Meetei Mayek input method for enhanced inscript layout.
+ 
+@@ -87,13 +87,13 @@
+   ((G-U) "ꯡ")
+   ("Y" "ꯚ")
+   ("]" "꯬")
+-  ("a" "ꯣ "
++  ("a" "ꯣ")
+   ("b" "ꯋ")
+   ("c" "ꯃ")
+   ((G-c) "ꯝ")
+   ("d" "꯭")
+   ("e" "ꯥ")
+-  ("f" "ꯤ)
++  ("f" "ꯤ")
+   ("g" "ꯨ")
+   ("h" "ꯄ")
+   ((G-h) "ꯞ")
+--- inscript2/IM/sat-inscript2-deva.mim	2016-04-23 09:41:51.000000000 +0200
++++ inscript2/IM/sat-inscript2-deva.mim	2019-10-10 11:58:46.793249433 +0200
+@@ -18,7 +18,7 @@
+ ;;
+ ;; Author: Parag Nemade <pnemade@redhat.com>
+ 
+-(input-method sat inscript2)
++(input-method sat inscript2-deva)
+ 
+ (description "Santali input method for enhanced inscript layout.
+ 
+--- inscript2/IM/sat-inscript2-olck.mim	2016-04-23 09:41:49.000000000 +0200
++++ inscript2/IM/sat-inscript2-olck.mim	2019-10-10 11:58:46.793249433 +0200
+@@ -18,7 +18,7 @@
+ ;;
+ ;; Author: Parag Nemade <pnemade@redhat.com>
+ 
+-(input-method sat inscript2)
++(input-method sat inscript2-olck)
+ 
+ (description "Santali Ol Chicky input method for enhanced inscript layout.
+ 

SOURCES/m17n-db-1.8.0-ml-mozhi-savannah-bug-59681.patch

@@ -0,0 +1,28 @@
+commit 3e26647b3ec04c95f97e435b79f1f148ba8a6950
+Author: Rajeesh K V <rajeeshknambiar@gmail.com>
+Date:   Mon Dec 14 15:58:11 2020 +0530
+
+    Malayalam mozhi input method: fix spurious ZWNJ being added
+
+diff --git a/MIM/ml-mozhi.mim b/MIM/ml-mozhi.mim
+index e502c7a..ce0b84f 100644
+--- MIM/ml-mozhi.mim
++++ MIM/ml-mozhi.mim
+@@ -113,7 +113,7 @@ For the details, see the page:
+   ("N__" "ണ്‍")
+   ("n__" "ന്‍")
+   ("l__" "ല്‍")
+-  ("L__" "‌‌ള്‍")
++  ("L__" "ള്‍")
+   ("r__" "ര്‍")
+   ("R__" "ര്‍")
+   ("x" "ക്ഷ്"))
+@@ -147,7 +147,7 @@ For the details, see the page:
+   (".n" "ം")
+   ("M" "ം")
+   ("~" "്")
+-  ("_" "‌‌")     
++  ("_" "‌")     
+   ("m_" "ം")
+   ("m " "ം ")
+   ("m," "ം,")

SPECS/m17n-db.spec

@@ -1,7 +1,7 @@
 Name:       m17n-db
 Summary:    Multilingualization datafiles for m17n-lib
 Version:    1.8.0
-Release:    3%{?dist}
+Release:    16%{?dist}
 License:    LGPLv2+
 URL:        http://www.nongnu.org/m17n
 
@@ -10,8 +10,10 @@ Source0:    http://download-mirror.savannah.gnu.org/releases/m17n/%{name}-%{vers
 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
+Source3:    https://github.com/mike-fabian/m17n-db-sayura/archive/1.0.0.tar.gz#/m17n-db-sayura-1.0.0.tar.gz
 
 BuildArch:  noarch
+BuildRequires: make
 BuildRequires: gettext
 BuildRequires: glibc-locale-source
 BuildRequires: gcc
@@ -19,12 +21,15 @@ BuildRequires: gcc
 Obsoletes:  m17n-contrib < 1.1.14-4.fc20
 Provides:   m17n-contrib = 1.1.14-4.fc20
 
-# Fedora speicifc patches
+# Fedora specific patches
 Patch0:     %{name}-1.6.5-bn-itrans-bug182227.patch
 Patch1:     %{name}-1.6.5-kn-itrans_key-summary_bug228806.patch
 Patch2:     %{name}-1.6.5-kn-inscript-ZWNJ-bug440007.patch
 Patch3:     %{name}-1.6.5-number_pad_itrans-222634.patch
 Patch4:     %{name}-1.7.0-fix-e-o-mappings.patch
+Patch5:     %{name}-1.8.0-inscript2-mni-sat.patch
+# https://savannah.nongnu.org/bugs/?59681
+Patch6:     %{name}-1.8.0-ml-mozhi-savannah-bug-59681.patch
 
 %description
 This package contains multilingualization (m17n) datafiles for m17n-lib
@@ -50,20 +55,24 @@ m17n-db development files
 
 
 %prep
-%autosetup -p0
+%autosetup -N
 
 ##extract inscript2 maps
 tar xzf %{SOURCE1}
+##extract m17n-db-sayura
+tar xzf %{SOURCE3}
+
+%autopatch -p0
 
 # 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}
+%{make_build}
 
 %install
-make install DESTDIR=%{buildroot} INSTALL="install -p"
+%{make_install}
 
 # don't ship unijoy map for now
 rm %{buildroot}%{_datadir}/m17n/bn-unijoy.mim
@@ -77,7 +86,11 @@ cp -p inscript2/IM/* %{buildroot}%{_datadir}/m17n/
 cp -p inscript2/icons/* %{buildroot}%{_datadir}/m17n/icons
 
 # install minglish keymap
-cp -p %{SOURCE2} %{buildroot}%{_datadir}/m17n
+/usr/bin/install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/m17n
+
+# install si-sayura
+cp -p m17n-db-sayura-1.0.0/si-sayura.mim %{buildroot}%{_datadir}/m17n
+cp -p m17n-db-sayura-1.0.0/icons/si-sayura.png %{buildroot}%{_datadir}/m17n/icons
 
 # For installing the translation files
 %find_lang %name
@@ -135,6 +148,47 @@ cp -p %{SOURCE2} %{buildroot}%{_datadir}/m17n
 %{_datadir}/pkgconfig/m17n-db.pc
 
 %changelog
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.8.0-16
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Tue Jun 08 2021 Parag Nemade <pnemade AT redhat DOT com> - 1.8.0-15
+- Resolves:rhbz#1961997 - minglish file permission fix
+
+* Tue Jun 08 2021 Parag Nemade <pnemade AT redhat DOT com> - 1.8.0-14
+- Resolves:rhbz#1961997 - Add gating tests from rhel-8
+- Malayalam Mozhi input scheme bug fix
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.8.0-13
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Mar 18 2020 Parag Nemade <pnemade AT redhat DOT com> - 1.8.0-10
+- Use make_build and make_install macros
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Oct 10 2019 Mike FABIAN <mfabian@redhat.com> - 1.8.0-8
+- Fix mni-inscript2-{beng,mtei}.mim and sat-inscript2-{deva,olck}.mim
+
+* Thu Aug 29 2019 Mike FABIAN <mfabian@redhat.com> - 1.8.0-7
+- Add si-sayura.mim input method
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Mon Feb 19 2018 Parag Nemade <pnemade AT redhat DOT com> - 1.8.0-3
 - Add BuildRequires: gcc as per packaging guidelines