From 9fa04e52c03f8abcb8e6f7f1948dece257f31ae5 Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Wed, 3 May 2023 16:10:08 +0200 Subject: [PATCH] Update to 1.8.1 - Remove inscript2-20210820.tar.gz because it is now included upstream - Remove m17n-db-1.8.0-ml-mozhi-savannah-bug-59681.patch because it is included upstream - Remove unicode.mim because the improvement is included upstream --- .gitignore | 1 + m17n-db.spec | 26 ++++++------------ sources | 3 +- unicode.mim | 78 ---------------------------------------------------- 4 files changed, 10 insertions(+), 98 deletions(-) delete mode 100644 unicode.mim diff --git a/.gitignore b/.gitignore index 8196051..4647550 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ m17n-db-1.6.1.tar.gz /inscript2-20210809.tar.gz /inscript2-20210812.tar.gz /inscript2-20210820.tar.gz +/m17n-db-1.8.1.tar.gz diff --git a/m17n-db.spec b/m17n-db.spec index a640afa..7fa14fc 100644 --- a/m17n-db.spec +++ b/m17n-db.spec @@ -1,13 +1,11 @@ Name: m17n-db Summary: Multilingualization datafiles for m17n-lib -Version: 1.8.0 -Release: 29%{?dist} +Version: 1.8.1 +Release: 1%{?dist} License: LGPL-2.1-or-later URL: http://www.nongnu.org/m17n Source0: http://download-mirror.savannah.gnu.org/releases/m17n/%{name}-%{version}.tar.gz -## Till the Inscript2 gets upstreamed in m17n-db, use this source -Source1: https://releases.pagure.org/inscript2/inscript2-20210820.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 @@ -15,9 +13,6 @@ Source4: https://raw.githubusercontent.com/shantanuo/gamabhana/main/usr/share Source5: https://github.com/shantanuo/gamabhana/blob/main/usr/share/m17n/icons/mr-gamabhana.png Source6: https://raw.githubusercontent.com/mike-fabian/m17n-db-bn-national-jatiya/main/bn-national-jatiya.mim Source7: https://raw.githubusercontent.com/mike-fabian/m17n-db-bn-national-jatiya/main/icons/bn-national-jatiya.png -# Improved unicode.mim, see: -# https://lists.nongnu.org/archive/html/m17n-list/2022-06/msg00009.html -Source8: unicode.mim BuildArch: noarch BuildRequires: make @@ -34,8 +29,6 @@ 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 -# 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 @@ -63,8 +56,6 @@ m17n-db development files %prep %autosetup -N -##extract inscript2 maps -tar xzf %{SOURCE1} ##extract m17n-db-sayura tar xzf %{SOURCE3} @@ -83,10 +74,6 @@ sed -i 's/ ("ld" "སྡ")/ ("ld" "ལྡ")/g' MIM/bo-ewts.mim #removing ispell.mim for rh#587927 rm %{buildroot}%{_datadir}/m17n/ispell.mim -#install inscript2 keymaps -cp -p inscript2/IM/* %{buildroot}%{_datadir}/m17n/ -cp -p inscript2/icons/* %{buildroot}%{_datadir}/m17n/icons - # install minglish keymap /usr/bin/install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/m17n @@ -102,9 +89,6 @@ cp -p m17n-db-sayura-1.0.0/icons/si-sayura.png %{buildroot}%{_datadir}/m17n/icon /usr/bin/install -m 644 %{SOURCE6} %{buildroot}%{_datadir}/m17n /usr/bin/install -m 644 %{SOURCE7} %{buildroot}%{_datadir}/m17n/icons -# install improved unicode.mim -/usr/bin/install -m 644 %{SOURCE8} %{buildroot}%{_datadir}/m17n - # For installing the translation files %find_lang %name @@ -161,6 +145,12 @@ cp -p m17n-db-sayura-1.0.0/icons/si-sayura.png %{buildroot}%{_datadir}/m17n/icon %{_datadir}/pkgconfig/m17n-db.pc %changelog +* Wed May 03 2023 Mike FABIAN - 1.8.1-1 +- Update to 1.8.1 +- Remove inscript2-20210820.tar.gz because it is now included upstream +- Remove m17n-db-1.8.0-ml-mozhi-savannah-bug-59681.patch because it is included upstream +- Remove unicode.mim because the improvement is included upstream + * Thu Jan 19 2023 Fedora Release Engineering - 1.8.0-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index f1f2f67..d8d926e 100644 --- a/sources +++ b/sources @@ -1,4 +1,3 @@ -SHA512 (m17n-db-1.8.0.tar.gz) = b21abfdcb5eb42e71fbd5edd1a99eca4a05df14f5a57eac7cdd3dc657337bd143a419f4b3f3dd0b74b82c827ede4d3666dd213af9041593cef50118ee43898d5 +SHA512 (m17n-db-1.8.1.tar.gz) = 40f21526509386056e12ea4f81dac07c2069d33e53294309c623234a58e6fb863f9968b681c0d1464476d39524740f2a0427615e639c2be330c1787689d29006 SHA512 (m17n-db-sayura-1.0.0.tar.gz) = 59e89cb15f375057e9c506e6686db53ef617d3020e66711eaa0c6f8e31339d27345fc3490aefbf42193ce51cfa683f161a2b9c27b45f6b75e314892b15feba02 SHA512 (minglish.mim) = bb5ce81cd3c8457458b1ebeafc7ccad2dffda3a42fead59e25f9c4e98d6c19c36a221907d024a21aa750bfe0a06c327aa1ae8f79eb2d381a0f39b50c58e235ed -SHA512 (inscript2-20210820.tar.gz) = 8405286926a1f59271f8988f95e37d62c3200ba14bf1d323bdf2cd6cee88aa683b86af6389bd7aba779a36649b7e83c8afc5d1472d7b32c428ef271659176ed5 diff --git a/unicode.mim b/unicode.mim deleted file mode 100644 index fb374b7..0000000 --- a/unicode.mim +++ /dev/null @@ -1,78 +0,0 @@ -;; unicode.mim -- Input method for Unicode characters by typing character code -;; Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009 -;; National Institute of Advanced Industrial Science and Technology (AIST) -;; Registration Number H15PRO112 - -;; This file is part of the m17n database; 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 t unicode) - -(description (_"Input method for Unicode characters using hexadigits. -Type C-u followed by hexadecimal numbers [0-9A-Fa-f] -of a Unicode character code. -To finish and insert the resulting character, type a space. - -If you type more than 5 hex digits and finish with space, -the result is empty and nothing at all is inserted. -")) - -(title "UNICODE") - -(variable - (prompt (_"Preedit prompt -Prompt string shown in the preedit area while typing hexadecimal numbers.") - "U+")) -(command - (start (_"Start Unicode -Start typing hexadecimal numbers of Unicode character.") - (C-U))) - -(map - (starter - (start prompt)) - - (hex - (" " " ") ; The space key is used to commit - ("0" "0") ("1" "1") ("2" "2") ("3" "3") ("4" "4") - ("5" "5") ("6" "6") ("7" "7") ("8" "8") ("9" "9") - ("A" "A") ("B" "B") ("C" "C") ("D" "D") ("E" "E") ("F" "F") - ("a" "A") ("b" "B") ("c" "C") ("d" "D") ("e" "E") ("f" "F")) - - (backspace - ((BackSpace)))) - -(state - (init - (starter (set code 0) (set count 0) (shift uni-hex))) - - (uni-hex - (hex (set this @-1) - (cond ((< @-1 ?A) (sub this 48)) - (1 (sub this 55))) - (cond ((= @-1 0x0020) (set code code)) - ((> count 4) (set code 0)) - (1 (set code (+ (* code 16) this)))) - (set count (+ count 1)) - (cond ((= @-1 0x0020) - (delete @<) (insert code) (shift init)))) - (backspace (undo)))) - -;; Local Variables: -;; mode: lisp -;; End: