update to 1.6.5

m17n-db.spec

@@ -1,20 +1,23 @@
 Name:       m17n-db
 Summary:    Multilingualization datafiles for m17n-lib
-Version:    1.6.4
+Version:    1.6.5
-Release:    3%{?dist}
+Release:    1%{?dist}
-Group:      System Environment/Libraries
 License:    LGPLv2+
 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-lib, use this source
+Source1:    https://fedorahosted.org/releases/i/n/inscript2/inscript2-20120320.tar.gz
 BuildArch:  noarch
 BuildRequires: gettext
 
+Obsoletes:  m17n-contrib < 1.1.14-4.fc20
+Provides:   m17n-contrib = 1.1.14-4.fc20
+
 # Fedora speicifc patches
-Patch1:     number_pad_itrans-222634.patch
+Patch0:     %{name}-%{version}-bn-itrans-bug182227.patch
-Patch2:     bn-itrans-t-182227.patch
+Patch1:     %{name}-%{version}-kn-itrans_key-summary_bug228806.patch
-Patch4:     kn-itrans_key-summary_228806.patch
+Patch2:     %{name}-%{version}-kn-inscript-ZWNJ-bug440007.patch
-Patch5:     ml-itrans-keysummary-435260.patch
+Patch3:     %{name}-%{version}-number_pad_itrans-222634.patch
-# Upstream patches
 
 %description
 This package contains multilingualization (m17n) datafiles for m17n-lib
@@ -23,15 +26,16 @@ font layout text rendering for languages.
 
 %package extras
 Summary:  Extra m17n-db files
-Group:    System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 
+Obsoletes:  m17n-contrib-extras < 1.1.14-4.fc20
+Provides:   m17n-contrib-extras = 1.1.14-4.fc20
+
 %description extras
 m17n-db extra files for input maps that are less used.
 
 %package devel
 Summary:  Development files for m17n-db
-Group:    Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description devel
@@ -41,10 +45,14 @@ m17n-db development files
 %prep
 %setup -q 
 pushd MIM
-%patch1 -p1 -b .1~
+%patch0 -p1
-%patch2 -p1 -b .2~
+%patch1 -p1
-%patch4 -p0 -b .4~
+%patch2 -p1
-%patch5 -p0 -b .5~
+%patch3 -p2
+
+##extract inscript2 maps
+tar xzf %{SOURCE1}
+
 popd
 
 %build
@@ -55,7 +63,7 @@ make %{?_smp_mflags}
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 # don't ship unijoy map for now
-rm $RPM_BUILD_ROOT%{_datadir}/m17n/{bn-unijoy.mim,icons/bn-unijoy.png}
+rm $RPM_BUILD_ROOT%{_datadir}/m17n/{bn-unijoy.mim,bn-unijoy.png}
 
 #removing ispell.mim for rh#587927
 rm $RPM_BUILD_ROOT%{_datadir}/m17n/ispell.mim
@@ -66,22 +74,42 @@ rm $RPM_BUILD_ROOT%{_datadir}/m17n/ispell.mim
 %files 
 %doc AUTHORS COPYING README
 %dir %{_datadir}/m17n
-%dir %{_datadir}/m17n/icons
 %{_datadir}/m17n/mdb.dir
 %{_datadir}/m17n/*.tbl
-%{_datadir}/m17n/*.mim
+%{_datadir}/m17n/scripts
-%exclude %{_datadir}/m17n/zh-*.mim
+%{_datadir}/m17n/a*.mim
-%exclude %{_datadir}/m17n/icons/zh*.png
+%{_datadir}/m17n/b*.mim
-%exclude %{_datadir}/m17n/ja-*.mim
+%{_datadir}/m17n/c*.mim
-%exclude %{_datadir}/m17n/icons/ja*.png
+%{_datadir}/m17n/d*.mim
-%{_datadir}/m17n/icons/*.png
+%{_datadir}/m17n/e*.mim
+%{_datadir}/m17n/f*.mim
+%{_datadir}/m17n/g*.mim
+%{_datadir}/m17n/h*.mim
+%{_datadir}/m17n/i*.mim
+%{_datadir}/m17n/k*.mim
+%{_datadir}/m17n/l*.mim
+%{_datadir}/m17n/m*.mim
+%{_datadir}/m17n/n*.mim
+%{_datadir}/m17n/o*.mim
+%{_datadir}/m17n/p*.mim
+%{_datadir}/m17n/r*.mim
+%{_datadir}/m17n/s*.mim
+%{_datadir}/m17n/t*.mim
+%{_datadir}/m17n/u*.mim
+%{_datadir}/m17n/v*.mim
+%{_datadir}/m17n/y*.mim
+%{_datadir}/m17n/*.png
 %{_datadir}/m17n/*.flt
+%exclude %{_datadir}/m17n/zh-*.mim
+%exclude %{_datadir}/m17n/zh*.png
+%exclude %{_datadir}/m17n/ja-*.mim
+%exclude %{_datadir}/m17n/ja*.png
 
 %files extras -f %{name}.lang
 %{_datadir}/m17n/zh-*.mim
-%{_datadir}/m17n/icons/zh*.png
+%{_datadir}/m17n/zh*.png
 %{_datadir}/m17n/ja*.mim
-%{_datadir}/m17n/icons/ja*.png
+%{_datadir}/m17n/ja*.png
 %{_datadir}/m17n/*.fst
 %{_datadir}/m17n/*.map
 %{_datadir}/m17n/*.tab
@@ -93,6 +121,9 @@ rm $RPM_BUILD_ROOT%{_datadir}/m17n/ispell.mim
 %{_datadir}/pkgconfig/m17n-db.pc
 
 %changelog
+* Wed Jan 29 2013 Parag Nemade <pnemade AT redhat DOT com> - 1.6.5-1
+- update to 1.6.5
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -250,7 +281,7 @@ rm $RPM_BUILD_ROOT%{_datadir}/m17n/ispell.mim
 * Thu Feb 8 2007 Mayank Jain <majain@redhat.com>
 - Added phonetic keymaps for Marathi & Oriya, resolved - 225559 and 225562
 
-* Tue Jan 17 2007 Mayank Jain <majain@redhat.com>
+* Wed Jan 17 2007 Mayank Jain <majain@redhat.com>
 - Added Patch 4 as number_pad_itrans-222634.patch for adding number pad support in itrans keymaps
 - Added number pad support in all indic keymaps except tamil as they used english numerals.
 - Resolves bug : 222634
@@ -258,10 +289,10 @@ rm $RPM_BUILD_ROOT%{_datadir}/m17n/ispell.mim
 * Tue Jan 16 2007 Mayank Jain <majain@redhat.com>
 - Added Patch 3 as sk-kbd-222804.patch to fix bug 222804
 
-* Tue Jan 11 2007 Mayank Jain <majain@redhat.com>
+* Thu Jan 11 2007 Mayank Jain <majain@redhat.com>
 - Moved all translations to m17n-db-datafiles package
 
-* Tue Jan 8 2007 Mayank Jain <majain@redhat.com>
+* Mon Jan 8 2007 Mayank Jain <majain@redhat.com>
 - Resolves: Bug 221794 - Rebased to new release m17n-db-1.3.4
 - Removed patch: si-wijesekera_surrounding_to_preedit.patch
 - Added directive to delete si-wijesekera from the upstream tarball as it used surrounding text
@@ -278,7 +309,7 @@ rm $RPM_BUILD_ROOT%{_datadir}/m17n/ispell.mim
 * Thu Dec 7 2006 Mayank Jain <majain@redhat.com>
 - Resolves: bug 218255 - Fixed ta-typewriter keymap.
 
-* Tue Dec 1 2006 Mayank Jain <majain@redhat.com>
+* Fri Dec 1 2006 Mayank Jain <majain@redhat.com>
 - Fixed typo in si-wijesekera key summary (in the patch)
 
 * Tue Nov 28 2006 Mayank Jain <majain@redhat.com>
@@ -295,7 +326,7 @@ rm $RPM_BUILD_ROOT%{_datadir}/m17n/ispell.mim
 - Retained mapping of (.) to (.) in as-inscript as per bug 215486
 - Fixed an error in ta-tamil99 key summary.
 
-* Mon Nov 14 2006 Mayank Jain <majain@redhat.com>
+* Tue Nov 14 2006 Mayank Jain <majain@redhat.com>
 - Fixed Bug 177371: mapping of X and x in kn-kgp
 - Fixed Bug 215486: Mapped 0x0964 to shift(.) instead of . in as-inscript
 - Fixed Bug 215489: Mapped 0x0964 to shift(.) instead of . in bn-inscript
@@ -303,25 +334,25 @@ rm $RPM_BUILD_ROOT%{_datadir}/m17n/ispell.mim
 * Mon Nov 13 2006 Mayank Jain <majain@redhat.com>
 - Added ZWNJ to ml-inscript, fixes 214971
 
-* Mon Nov 9 2006 Mayank Jain <majain@redhat.com>
+* Thu Nov 9 2006 Mayank Jain <majain@redhat.com>
 - Fixed an errounous fix of ZWNJ to hi-inscript/phonetic
 
 * Mon Nov 6 2006 Mayank Jain <majain@redhat.com>
 - Fixed Bug 213633: Need changes in Assamese Inscript layout
 
-* Mon Nov 2 2006 Mayank Jain <majain@redhat.com>
+* Thu Nov 2 2006 Mayank Jain <majain@redhat.com>
 - Added ZWNJ to hi-inscript/phonetic
 
-* Mon Nov 1 2006 Mayank Jain <majain@redhat.com>
+* Wed Nov 1 2006 Mayank Jain <majain@redhat.com>
 - Added 09CE mapped to z in as-inscript (213372)
 
-* Mon Nov 1 2006 Mayank Jain <majain@redhat.com>
+* Wed Nov 1 2006 Mayank Jain <majain@redhat.com>
 - Imported m17n-db-indic-0.4.29.tar.gz from RHEL-5 package, changes happened from .28 version are
 - Added few more key combinations for ta-typewriter keymap - bug 209088
 - Added ZWJ for hi-inscript and hi-phonetic keymaps - bug 211576
 - Corrected kn-kgp and kn-inscript keymaps for keymapping of X - bug 209963
 
-* Mon Oct 17 2006 Mayank Jain <majain@redhat.com>
+* Tue Oct 17 2006 Mayank Jain <majain@redhat.com>
 - Added si-wijesekera keymap with preedit, replaces si-wijesekera with surrounding text support
 - Fixed kn-kgp keymap
 
@@ -361,11 +392,11 @@ rm $RPM_BUILD_ROOT%{_datadir}/m17n/ispell.mim
 - Added key summaries to pa-inscript/jhelum
 - Fixed 204755
 
-* Tue Aug 31 2006 Mayank Jain <majain@redhat.com>
+* Thu Aug 31 2006 Mayank Jain <majain@redhat.com>
 - Added ur-phonetic icon
 - Updated spec file to incorporate the icon
 
-* Tue Aug 31 2006 Mayank Jain <majain@redhat.com>
+* Thu Aug 31 2006 Mayank Jain <majain@redhat.com>
 - Updated bn-{inscript,probhat,itrans} for RH bug #204275
 - Added ur-phonetic.mim file for RH bug #177372
 - Updated m17n-db.spec file to incorporate Urdu keymap.