15 changed files with 205 additions and 268 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,12 @@
-SOURCES/inscript2-20160423.tar.gz
-SOURCES/m17n-db-1.8.0.tar.gz
+m17n-db-1.6.1.tar.gz
+/m17n-db-1.6.2.tar.gz
+/m17n-db-1.6.3.tar.gz
+/m17n-db-1.6.4.tar.gz
+/m17n-db-1.6.5.tar.gz
+/inscript2-20120320.tar.gz
+/m17n-db-1.7.0.tar.gz
+/inscript2-20160423.tar.gz
+/minglish.mim
+/m17n-db-1.8.0RC.tar.gz
+/m17n-db-1.8.0.tar.gz
+/m17n-db-sayura-1.0.0.tar.gz
--- a/.m17n-db.metadata
+++ b/.m17n-db.metadata
@ -1,2 +1,4 @@
-ed1e419adb26fc79c1b3b9de8a3ac3a089e35b51 SOURCES/inscript2-20160423.tar.gz
-b314d22e726b06676f405ac1e06cad2823868bc3 SOURCES/m17n-db-1.8.0.tar.gz
+b314d22e726b06676f405ac1e06cad2823868bc3 m17n-db-1.8.0.tar.gz
+fe31c1a0a84af563ecc835b0633340fd99e81139 m17n-db-sayura-1.0.0.tar.gz
+ed1e419adb26fc79c1b3b9de8a3ac3a089e35b51 inscript2-20160423.tar.gz
+07612ae1a43805b45881d79fefd338f95bb7d6cc minglish.mim
--- a/SOURCES/minglish.mim
+++ b/SOURCES/minglish.mim
@ -1,258 +0,0 @@
-;; minglish.mim -- Marathi input method with Minglish input method
-;; Author:- Anish Patil <apatil@redhat.com>
-;; Minglish is combination of Marathi and English language 
-;; 
-;; 
-
-;; This file is part of the m17n contrib; a sub-part of the m17n
-;; library.
-
-;; The m17n library is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public License
-;; as published by the Free Software Foundation; either version 2.1 of
-;; the License, or (at your option) any later version.
-
-;; The m17n library is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; Lesser General Public License for more details.
-
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with the m17n library; if not, write to the Free
-;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-(input-method mr minglish)
-
-(description "Marathi input method for Marathi and English 
-Author: Anish Patil <apatil@redhat.com>
-")
-
-(title "क")
-
-(map
- (starter
-  (".") ("~") ("#") ("$") ("^") ("*") ((S-\ )) ((C-@))
-  ("0") ("1") ("2") ("3") ("4")
-  ("5") ("6") ("7") ("8") ("9")
-  ("A") ("C") ("D") ("E") ("G") ("H") ("I") ("J") ("K") ("L")
-  ("M") ("N") ("O") ("R") ("S") ("T") ("U") ("Y")
-  ("a") ("b") ("c") ("d") ("e") ("f") ("g") ("h") ("i")
-  ("j") ("k") ("l") ("m") ("n") ("o") ("p") ("q") ("r")
-  ("s") ("t") ("u") ("v") ("w") ("x") ("y") ("z")
-  ((G-s)) ((G-k)) ((G-K)) ((G-g)) ((G-G)) 
-  ((G-j)) ((G-J)) ((G-d)) ((G-D)) ((G-n)) ((G-N)) ((G-t)) ((G-T)) 
-  ((G-p)) ((G-P)) ((G-f)) ((G-F)) ((G-m))
-  ((G-y)) ((G-r)) ((G-l)) ((G-L)) 
-  ((G-v)) ((G-w)) ((G-h)) ((G-z))
-  )
-
-
- (consonant
-  ("k" "क")
-  ((G-k) "क्")
-  ("K" "ख")
-  ("kh" "ख")
-  ((G-K) "ख्")
-  ("g" "ग")
-  ((G-g) "ग्")
-  ("G" "घ")
-  ("gh" "घ")
-  ((G-G) "घ्")
-  ("~N" "ङ्")
-  ("N^" "ङ्")
-  ("c" "च")
-  ("ch" "छ")			      
-  ("chh" "छ्")
-  ("j" "ज")
-  ((G-j) "ज्")
-  ("J" "झ")
-  ("jh" "झ")
-  ((G-J) "झ्")
-  ("~n" "ञ")
-  ("JN" "ञ्")
-  ("d" "ड")
-  ((G-d) "ड्")
-  ("D" "ढ")
-  ("dh" "ढ")
-  ((G-D) "ढ्")
-  ("n" "न")
-  ((G-n) "न्")
-  ("N" "ण")
-  ((G-N) "ण्")
-  ("t" "त")
-  ((G-t) "त्")
-  ("T" "ट")
-  ("Th" "ठ")
-  ("th" "थ")
-  ((G-T) "थ्")
-  ("the" "द")
-  ("dha" "ध")
-  ("nh" "ऩ्")			      
-  ("p" "प")
-  ((G-p) "प्")
-  ("P" "फ")
-  ((G-P) "फ्")
-  ("f" "फ")
-  ((G-f) "फ्")
-  ((G-F) "फ्")
-  ("F" "फ")
-  ("ph" "फ")
-  ("b" "ब")
-  ((G-b) "ब्")
-  ("B" "भ")
-  ("bh" "भ")
-  ((G-B) "भ्")
-  ("m" "म")
-  ((G-m) "म्")
-  ("M" "ं")
-  ("y" "य")
-  ("Y" "य़्")			      
-  ("yh" "य़्")			      
-  ((G-y) "य़्")
-  ("r" "र")
-  ((G-r) "र्")
-  ("rh" "ऱ्")			      
-  ("l" "ल")
-  ((G-l) "ल्")
-  ("L" "ळ")
-  ("ld" "ळ")
-  ((G-L) "ळ्")
-  ("v" "व")
-  ((G-v) "व्")
-  ("w" "व्")
-  ((G-w) "व्")
-  ("s" "स")
-  ((G-s) "स्")
-  ("sh" "श")
-  ("S" "श")
-  ((G-S) "श्")
-  ("shh" "ष")
-  ("Sh" "ष")
-  ("h" "ह")
-  ((G-h) "ह्")
-  ("q" "कु")
-  ("K" "ख़्")
-  ("G" "ग़्")
-  ("z" "झ्")
-  ("Z" "ँ")
-  ((G-z) "झ्")
-  (".D" "ड़्")
-  (".Dh" "ढ़्")
-  ("j~n" "ज्ञ्")
-  ("GY" "ज्ञ्")
-  ("dny" "ज्ञ")		      
-  ("x" "क्ष्"))
-
- (independent
-  ("a" "अ")
-  ("aa" "आ")
-  ("A" "ा")
-  ("i" "इ")
-  ("ii" "ई")
-  ("I" "ई")
-  ("u" "उ")
-  ("uu" "ऊ")
-  ("U" "ऊ")
-  ("RRi" "ऋ")
-  ("R^i" "ऋ")
-  ("LLi" "ऌ")			      
-  ("L^i" "ऌ")			      
-  (".c" "ऍ")			      
-  ("e.c" "ऍ")
-  ("ee" "ऎ")			      
-  ("E" "ऎ")			      
-  ("e" "ए")
-  ("ai" "ऐ")
-  ("o.c" "ऑ")
-  ("oo" "ऒ")			      
-  ("O" "ऒ")			      
-  ("o" "ओ")
-  ("au" "औ")
-  ("RRI" "ॠ")			      
-  ("R^I" "ॠ")			      
-  ("LLI" "ॡ")			      
-  ("L^I" "ॡ")			      
-  (".N" "ँ")
-  (".n" "ं")
-  ("M" "ं")
-  ("H" "ः")
-  (".a" "ऽ")
-  (".h" "्")
-  ("AUM" "ॐ")
-  ("OM" "ॐ")
-  (".." "।")			      
-  ("0" "०")
-  ("1" "१")
-  ("2" "२")
-  ("3" "३")
-  ("4" "४")
-  ("5" "५")
-  ("6" "६")
-  ("7" "७")
-  ("8" "८")
-  ("9" "९")
-  ("#" "्र")			      
-  ("$" "र्")			      
-  ("^" "त्र")			     
-  ("*" "श्र")			     
-  ("]" "़")			     
-  ((S-\ ) "‌")			     
-  ((C-@) "‍"))			     
-
- (dependent
-  ("a"  "ा")
-  ("aa"  "ा")
-  ("A"  "ा")
-  ("i"  "ि")
-  ("ii" "ी")
-  ("I"  "ी")
-  ("u"  "ु")
-  ("uu" "ू")
-  ("U"  "ू")
-  ("RRi" "ृ")
-  ("R^i" "ृ")
-  ("LLi" "ॢ")	      
-  ("L^i" "ॢ")	      
-  (".c"  "ॅ")	      
-  ("e.c" "ॅ")
-  ("ee"  "ॆ")	      
-  ("E"   "ॆ")	
-  ("e"   "े")
-  ("ai"  "ै")
-  ("o.c" "ॉ")
-  ("oo"  "ॊ")	
-  ("O"   "ॊ")	
-  ("o"   "ो")
-  ("au"  "ौ")
-  ("RRI" "ॄ")	
-  ("R^I" "ॄ")	
-  ("LLI" "ॣ")
-  ("L^I" "ॣ"))
-
- (return
-  ((Return)))
-
- (backspace
-  ((BackSpace) (undo))))
-
-(state
- (init
-  (starter (pushback 1) (shift intermediate)))
-
- (intermediate
-  (consonant (shift second))
-  (independent (shift init))
-  (backspace)
-  (return(shift init) ))
-
- (second
-  (consonant)
-  (dependent (shift init))
-  (backspace)
-  (return (shift init))))
-
-;; Local Variables:
-;; coding: utf-8
-;; mode: emacs-lisp
-;; End:
--- a/gating.yaml
+++ b/gating.yaml
@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
--- a/SOURCES/m17n-db-1.6.5-bn-itrans-bug182227.patch
+++ b/SOURCES/m17n-db-1.6.5-bn-itrans-bug182227.patch
--- a/SOURCES/m17n-db-1.6.5-kn-inscript-ZWNJ-bug440007.patch
+++ b/SOURCES/m17n-db-1.6.5-kn-inscript-ZWNJ-bug440007.patch
--- a/SOURCES/m17n-db-1.6.5-kn-itrans_key-summary_bug228806.patch
+++ b/SOURCES/m17n-db-1.6.5-kn-itrans_key-summary_bug228806.patch
--- a/SOURCES/m17n-db-1.6.5-number_pad_itrans-222634.patch
+++ b/SOURCES/m17n-db-1.6.5-number_pad_itrans-222634.patch
--- a/SOURCES/m17n-db-1.7.0-fix-e-o-mappings.patch
+++ b/SOURCES/m17n-db-1.7.0-fix-e-o-mappings.patch
--- a/m17n-db-1.8.0-inscript2-mni-sat.patch
+++ b/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.
+ 
--- a/m17n-db-1.8.0-ml-mozhi-savannah-bug-59681.patch
+++ b/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," "ം,")
--- a/SPECS/m17n-db.spec
+++ b/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

--- a/4
+++ b/4
@ -0,0 +1,4 @@
+SHA512 (m17n-db-1.8.0.tar.gz) = b21abfdcb5eb42e71fbd5edd1a99eca4a05df14f5a57eac7cdd3dc657337bd143a419f4b3f3dd0b74b82c827ede4d3666dd213af9041593cef50118ee43898d5
+SHA512 (m17n-db-sayura-1.0.0.tar.gz) = 59e89cb15f375057e9c506e6686db53ef617d3020e66711eaa0c6f8e31339d27345fc3490aefbf42193ce51cfa683f161a2b9c27b45f6b75e314892b15feba02
+SHA512 (inscript2-20160423.tar.gz) = 4fa91ddf818cbbb53f2ba34e72ffac0eb16448d817cc4c11ea7b39cbf7802e09b46661c03ee88f738bbda40848dacb7741ae5b865fc2d477e621345195c43a71
+SHA512 (minglish.mim) = bb5ce81cd3c8457458b1ebeafc7ccad2dffda3a42fead59e25f9c4e98d6c19c36a221907d024a21aa750bfe0a06c327aa1ae8f79eb2d381a0f39b50c58e235ed
--- a/tests/smoke/runtest.sh
+++ b/tests/smoke/runtest.sh
@ -0,0 +1,20 @@
+#!/bin/bash
+
+# If one of the commands below returns non-zero then exit immediately
+set -e
+
+echo "m17n-db version: `m17n-db --version`"
+echo "m17n-db directory: `m17n-db`"
+echo " "
+echo " "
+echo "Test minimal syntax presence for mim files"
+for file in `ls /usr/share/m17n/*.mim`; do
+    grep "(input-method" $file
+    if [ $? == 0 ]; then
+        echo "PASSED: minimal syntax for $file"
+    else
+        echo "FAILED: minimal syntax for $file"
+        exit 1
+    fi
+done
+
--- a/tests/tests.yml
+++ b/tests/tests.yml
@ -0,0 +1,11 @@
+---
+- hosts: localhost
+  tags:
+  - classic
+  roles:
+  - role: standard-test-basic
+    tests:
+    - smoke
+    required_packages:
+    - m17n-db
+