rpms/m17n-contrib/F-9 or-inscript-ZWJ-ZWNJ-466748.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 as-inscript-keysummary-440201.patch, 1.1, 1.2 bug433416-bn-probhat.patch, 1.1, 1.2 kn-inscript-ZWNJ-440007.patch, 1.1, 1.2 m17n-contrib.spec, 1.11, 1.12 ml-inscript-keysummary-435259.patch, 1.1, 1.2 sources, 1.6, 1.7

Fri Nov 7 07:50:41 UTC 2008

Author: petersen

Update of /cvs/pkgs/rpms/m17n-contrib/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2221

Modified Files:
	.cvsignore as-inscript-keysummary-440201.patch 
	bug433416-bn-probhat.patch kn-inscript-ZWNJ-440007.patch 
	m17n-contrib.spec ml-inscript-keysummary-435259.patch sources 
Added Files:
	or-inscript-ZWJ-ZWNJ-466748.patch 
Log Message:
backport from f10:

* Wed Nov 05 2008 Parag Nemade <pnemade at redhat.com> -1.1.8-2.fc10
- Resolves: Bug 466748-[or_IN] Needed ZWJ & ZWNJ for Oriya Inscript keymap

* Tue Oct 21 2008 Parag Nemade <pnemade at redhat.com> -1.1.8-1.fc10
- Update to new upstream release 1.1.8

* Mon Oct 20 2008 Jens Petersen <petersen at redhat.com> - 1.1.7-5.fc10
- add obsoletes for ibus-m17n subpackages

* Wed Oct 15 2008 Parag Nemade <pnemade at redhat.com> - 1.5.2-4
- create .engine files for ibus-m17n with m17n-gen-ibus-engine (#466410)

* Thu Sep 04 2008 Parag Nemade <pnemade at redhat.com> -1.1.7-3
- Resolves: rh# Bug 458264-Required Inscript map for Sindhi language 

* Fri Jul 04 2008 Parag Nemade <pnemade at redhat.com> -1.1.7-2
- Resolves: rh#453910: [kn_IN]Include latest kn- kgp.mim againist the latest build

* Thu Jul 03 2008 Parag Nemade <pnemade at redhat.com> -1.1.7-1
- Update to new upstream release 1.1.7

* Wed May 21 2008 Parag Nemade <pnemade at redhat.com> -1.1.6-4
- Resolves: rh#447682,rh#447683



or-inscript-ZWJ-ZWNJ-466748.patch:

--- NEW FILE or-inscript-ZWJ-ZWNJ-466748.patch ---
--- m17n-contrib-1.1.8/im/or-inscript.mim.old	2007-06-19 11:12:55.000000000 +0530
+++ m17n-contrib-1.1.8/im/or-inscript.mim	2008-11-05 15:37:01.000000000 +0530
@@ -78,9 +78,9 @@
   ("6" "à¬")
   ("7" "à")
   ("8" "à®")
-  ("(" "(")
+  ("(" "â€")
   ("9" "à¯")
-  (")" ")")
+  (")" "â€Œ")
   ("0" "à¦")
   ("_" "à¬ƒ")   
   ("-" "-") 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-contrib/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Feb 2008 05:02:04 -0000	1.5
+++ .cvsignore	7 Nov 2008 07:50:08 -0000	1.6
@@ -2,3 +2,5 @@
 m17n-contrib-1.1.4.tar.gz
 m17n-contrib-1.1.5.tar.gz
 m17n-contrib-1.1.6.tar.gz
+m17n-contrib-1.1.7.tar.gz
+m17n-contrib-1.1.8.tar.gz

as-inscript-keysummary-440201.patch:

Index: as-inscript-keysummary-440201.patch
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-contrib/F-9/as-inscript-keysummary-440201.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- as-inscript-keysummary-440201.patch	2 Apr 2008 11:22:39 -0000	1.1
+++ as-inscript-keysummary-440201.patch	7 Nov 2008 07:50:08 -0000	1.2
@@ -1,5 +1,5 @@
---- m17n-contrib-1.1.6/im/as-inscript.mim	2008-01-29 10:08:08.000000000 +0530
-+++ m17n-contrib-1.1.6/im/as-inscript-new.mim	2008-04-02 13:54:17.000000000 +0530
+--- m17n-contrib-1.1.8/im/as-inscript.mim	2008-01-29 10:08:08.000000000 +0530
++++ m17n-contrib-1.1.8/im/as-inscript-new.mim	2008-04-02 13:54:17.000000000 +0530
 @@ -41,8 +41,8 @@
  6. The alphabet 'à¦†' can be typed in two ways: one is to type 'à¦…' and then 'à¦¾' ,i.e. 'D' and then 'e'; other is by typing 'E' alone.
  7. The alphabet 'à¦ƒ' is found in '_' key, i.e. 'Shift' and then '-' key in English keyboard.

bug433416-bn-probhat.patch:

Index: bug433416-bn-probhat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-contrib/F-9/bug433416-bn-probhat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bug433416-bn-probhat.patch	28 Feb 2008 04:46:56 -0000	1.1
+++ bug433416-bn-probhat.patch	7 Nov 2008 07:50:08 -0000	1.2
@@ -1,5 +1,5 @@
---- m17n-contrib-1.1.6/im/bn-probhat.mim	2008-02-26 14:56:02.000000000 +0530
-+++ m17n-contrib-1.1.6/im/bn-probhat.new.mim	2008-02-26 14:53:07.000000000 +0530
+--- m17n-contrib-1.1.8/im/bn-probhat.mim	2008-02-26 14:56:02.000000000 +0530
++++ m17n-contrib-1.1.8/im/bn-probhat.new.mim	2008-02-26 14:53:07.000000000 +0530
 @@ -79,8 +79,8 @@
    (")" ?))
    ("0" ?à§¦)

kn-inscript-ZWNJ-440007.patch:

Index: kn-inscript-ZWNJ-440007.patch
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-contrib/F-9/kn-inscript-ZWNJ-440007.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kn-inscript-ZWNJ-440007.patch	2 Apr 2008 11:22:39 -0000	1.1
+++ kn-inscript-ZWNJ-440007.patch	7 Nov 2008 07:50:08 -0000	1.2
@@ -1,5 +1,5 @@
---- m17n-contrib-1.1.6/im/kn-inscript.mim	2007-06-19 11:12:55.000000000 +0530
-+++ m17n-contrib-1.1.6/im/kn-inscript-new.mim	2008-04-02 16:22:14.000000000 +0530
+--- m17n-contrib-1.1.8/im/kn-inscript.mim	2007-06-19 11:12:55.000000000 +0530
++++ m17n-contrib-1.1.8/im/kn-inscript-new.mim	2008-04-02 16:22:14.000000000 +0530
 @@ -59,6 +59,9 @@
  	\"à²œà³à²ž\" : à²œ + à³ + à²ž
  	p + d + } [OR] %


Index: m17n-contrib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-contrib/F-9/m17n-contrib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- m17n-contrib.spec	2 Apr 2008 11:22:39 -0000	1.11
+++ m17n-contrib.spec	7 Nov 2008 07:50:08 -0000	1.12
@@ -1,7 +1,7 @@
 Name:     m17n-contrib
 Summary:  Contributed multilingualization datafiles for m17n-lib
-Version:  1.1.6
-Release:  3%{?dist}
+Version:  1.1.8
+Release:  2%{?dist}
 Group:    System Environment/Libraries
 License:  LGPLv2+
 URL:      http://www.m17n.org/m17n-lib/index.html
@@ -10,8 +10,9 @@
 Patch1:	  as-inscript-keysummary-440201.patch
 Patch2:   ml-inscript-keysummary-435259.patch
 Patch3:   kn-inscript-ZWNJ-440007.patch
+Patch4:   or-inscript-ZWJ-ZWNJ-466748.patch
 BuildArch: noarch
-BuildRequires: m17n-db
+BuildRequires: m17n-db-devel
 Requires: m17n-db >= 1.4.0
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,8 +27,8 @@
 Group:      System Environment/Libraries\
 # for %{_datadir}/m17n\
 Requires:   m17n-contrib\
-Provides: m17n-db-%1 = %{version}-%{release}\
-Obsoletes: m17n-db-%1 < 1.4.0.1\
+Obsoletes:  m17n-db-%1 < 1.4.0.1\
+Obsoletes:  ibus-m17n-%1 < 0.1.1.20081013-3\
 \
 %description %1\
 This package provides contributed multilingualization (m17n) input maps\
@@ -36,6 +37,7 @@
 %files %1\
 %defattr(-,root,root,-)\
 %{_datadir}/m17n/%2-*.mim\
+%{_datadir}/ibus/engine/m17n-%2-*.engine\
 %if %3\
 %{_datadir}/m17n/icons/%2-*.png\
 %else\
@@ -49,6 +51,7 @@
 # for %{_datadir}/m17n\
 Requires:   m17n-contrib\
 Requires:   m17n-db-%1 >= 1.4.0 \
+Obsoletes:  ibus-m17n-%1 < 0.1.1.20081013-3\
 \
 %description %1\
 This package provides contributed multilingualization (m17n) input maps\
@@ -57,6 +60,7 @@
 %files %1\
 %defattr(-,root,root,-)\
 %{_datadir}/m17n/%2-*.mim\
+%{_datadir}/ibus/engine/m17n-%2-*.engine\
 %if %3\
 %{_datadir}/m17n/icons/%2-*.png\
 %else\
@@ -65,7 +69,7 @@
 
 %mk_pkg_uses_db assamese as 1
 %mk_pkg_uses_db bengali bn 1
-%mk_pkg esperanto eo 0
+%mk_pkg esperanto eo 1
 %mk_pkg_uses_db gujarati gu 1
 %mk_pkg_uses_db hindi hi 1
 %mk_pkg_uses_db kannada kn 1
@@ -75,6 +79,7 @@
 %mk_pkg_uses_db oriya or 1
 %mk_pkg_uses_db punjabi pa 1
 %mk_pkg_uses_db russian ru 0
+%mk_pkg sindhi sd 1
 %mk_pkg_uses_db sinhala si 0
 %mk_pkg tai tai 0
 %mk_pkg_uses_db tamil ta 1
@@ -89,6 +94,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %configure
@@ -99,17 +105,48 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -c -p"
 
+# generate .engine files for ibus-m17n for now
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/ibus/engine
+for i in $RPM_BUILD_ROOT%{_datadir}/m17n/*.mim; do
+  m17n-gen-ibus-engine $i $RPM_BUILD_ROOT%{_datadir}/ibus/engine
+done
+rm -rf $RPM_BUILD_ROOT/%{_bindir}
+
 %find_lang %name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README
 %{_datadir}/m17n/scripts
   
 %changelog
+* Wed Nov 05 2008 Parag Nemade <pnemade at redhat.com> -1.1.8-2.fc10
+- Resolves: Bug 466748-[or_IN] Needed ZWJ & ZWNJ for Oriya Inscript keymap
+
+* Tue Oct 21 2008 Parag Nemade <pnemade at redhat.com> -1.1.8-1.fc10
+- Update to new upstream release 1.1.8
+
+* Mon Oct 20 2008 Jens Petersen <petersen at redhat.com> - 1.1.7-5.fc10
+- add obsoletes for ibus-m17n subpackages
+
+* Wed Oct 15 2008 Parag Nemade <pnemade at redhat.com> - 1.5.2-4
+- create .engine files for ibus-m17n with m17n-gen-ibus-engine (#466410)
+
+* Thu Sep 04 2008 Parag Nemade <pnemade at redhat.com> -1.1.7-3
+- Resolves: rh# Bug 458264-Required Inscript map for Sindhi language 
+
+* Fri Jul 04 2008 Parag Nemade <pnemade at redhat.com> -1.1.7-2
+- Resolves: rh#453910: [kn_IN]Include latest kn- kgp.mim againist the latest build
+
+* Thu Jul 03 2008 Parag Nemade <pnemade at redhat.com> -1.1.7-1
+- Update to new upstream release 1.1.7
+
+* Wed May 21 2008 Parag Nemade <pnemade at redhat.com> -1.1.6-4
+- Resolves: rh#447682,rh#447683
+
 * Wed Apr 02 2008 Parag Nemade <pnemade at redhat.com> -1.1.6-3.fc9
 - Resolves: rh#440201,rh#435259,rh#440007
 

ml-inscript-keysummary-435259.patch:

Index: ml-inscript-keysummary-435259.patch
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-contrib/F-9/ml-inscript-keysummary-435259.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ml-inscript-keysummary-435259.patch	2 Apr 2008 11:22:39 -0000	1.1
+++ ml-inscript-keysummary-435259.patch	7 Nov 2008 07:50:08 -0000	1.2
@@ -1,5 +1,5 @@
---- m17n-contrib-1.1.6/im/ml-inscript.mim	2007-06-19 11:12:55.000000000 +0530
-+++ m17n-contrib-1.1.6/im/ml-inscript-new.mim	2008-04-02 12:28:16.000000000 +0530
+--- m17n-contrib-1.1.8/im/ml-inscript.mim	2007-06-19 11:12:55.000000000 +0530
++++ m17n-contrib-1.1.8/im/ml-inscript-new.mim	2008-04-02 12:28:16.000000000 +0530
 @@ -24,106 +24,127 @@
  (input-method ml inscript)
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-contrib/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Feb 2008 06:05:48 -0000	1.6
+++ sources	7 Nov 2008 07:50:08 -0000	1.7
@@ -1 +1 @@
-420dc1807c2d51b85bf7c9c0d517d8ba  m17n-contrib-1.1.6.tar.gz
+1e36885707c854a7b9437c2be628354e  m17n-contrib-1.1.8.tar.gz


