rpms/scim/devel scim-1.4.7-ja-sinhala-236715.patch, NONE, 1.1 scim.spec, 1.95, 1.96 xinput-scim, 1.12, 1.13

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/extras/rpms/scim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6443

Modified Files:
	scim.spec xinput-scim 
Added Files:
	scim-1.4.7-ja-sinhala-236715.patch 
Log Message:
- add scim-1.4.7-ja-sinhala-236715.patch to add Japanese translation of
  Sinhala (#236715)
- gtk2 now owns %{_libdir}/gtk-2.0/immodules
- add Nepali meta package
- specify full paths in xinput script and use SHORT_DESC



scim-1.4.7-ja-sinhala-236715.patch:

--- NEW FILE scim-1.4.7-ja-sinhala-236715.patch ---
--- scim-1.4.7/po/ja.po~	2007-06-27 00:31:56.000000000 +1000
+++ scim-1.4.7/po/ja.po	2007-09-13 17:37:32.000000000 +1000
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: ja\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-06-22 11:40-0700\n"
-"PO-Revision-Date: 2005-12-11 11:00+0900\n"
+"PO-Revision-Date: 2007-09-13 17:37+1000\n"
 "Last-Translator: Yukiko Bando <ybando at k6.dion.ne.jp>\n"
 "Language-Team: Japanese <ja at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -314,7 +314,7 @@ msgstr "ロシア語"
 
 #: ../src/scim_utility.cpp:768
 msgid "Sinhala"
-msgstr ""
+msgstr "シンハラ語"
 
 #: ../src/scim_utility.cpp:769 ../src/scim_keyboard_layout_data.h:4618
 msgid "Slovak"


Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/scim.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- scim.spec	17 Aug 2007 02:44:09 -0000	1.95
+++ scim.spec	13 Sep 2007 09:58:17 -0000	1.96
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.7
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPLv2+
@@ -38,6 +38,7 @@
 Patch12:   scim-fix-unload-segfault.patch
 Patch15:   scim-gtkimm-default-snooper-off-213796.patch
 Patch17:   scim-1.4.5-no-rpath-libdir.patch
+Patch18:   scim-1.4.7-ja-sinhala-236715.patch
 
 %description
 SCIM is a user friendly and full featured input method user interface and
@@ -69,6 +70,8 @@
 %package gtk
 Summary:    Smart Common Input Method Gtk IM module
 Group:      System Environment/Libraries
+# for %{_libdir}/gtk-2.0/immodules
+Requires: gtk2 >= 2.11.6-7.fc8
 # for update-gtk-immodules
 Requires(post): gtk2 >= 2.9.1-2
 Requires(postun): gtk2 >= 2.9.1-2
@@ -121,6 +124,7 @@
 %lang_meta_pkg latin scim-m17n, m17n-db-latin
 %lang_meta_pkg malayalam scim-m17n, m17n-db-malayalam m17n-contrib-malayalam
 %lang_meta_pkg marathi scim-m17n, m17n-contrib-marathi
+%lang_meta_pkg nepali scim-m17n m17n-contrib-nepali
 %lang_meta_pkg oriya scim-m17n, m17n-db-oriya m17n-contrib-oriya
 %lang_meta_pkg punjabi scim-m17n, m17n-db-punjabi m17n-contrib-punjabi
 %lang_meta_pkg sinhalese scim-sinhala scim-m17n m17n-db-sinhala m17n-contrib-sinhala
@@ -147,6 +151,7 @@
 %patch12 -p1 -b .12-unloadsegfault~
 %patch15 -p1 -b .15-key-snooper~
 %patch17 -p1 -b .17-rpath~
+%patch18 -p1 -b .18-sinhala~
 
 %if %{snapshot}
 ./bootstrap
@@ -269,7 +274,7 @@
 
 %files gtk
 %defattr(-,root,root,-)
-%{_libdir}/gtk-2.0/immodules
+%{_libdir}/gtk-2.0/immodules/im-scim.so
 
 
 %files libs
@@ -285,6 +290,13 @@
 
 
 %changelog
+* Thu Sep 13 2007 Jens Petersen <petersen at redhat.com> - 1.4.7-3
+- add scim-1.4.7-ja-sinhala-236715.patch to add Japanese translation of
+  Sinhala (#236715)
+- gtk2 now owns %{_libdir}/gtk-2.0/immodules
+- add Nepali meta package
+- specify full paths in xinput script and use SHORT_DESC
+
 * Fri Aug 17 2007 Jens Petersen <petersen at redhat.com> - 1.4.7-2
 - update License field
 - modify xinput.d script to not startup scim if no IMEs are installed


Index: xinput-scim
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/xinput-scim,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xinput-scim	17 Aug 2007 02:44:09 -0000	1.12
+++ xinput-scim	13 Sep 2007 09:58:17 -0000	1.13
@@ -21,8 +21,10 @@
 if [ "$IMENGINE_NO" -ge 1 ]; then
 
   XIM=SCIM
-  XIM_PROGRAM=scim
+  XIM_PROGRAM=/usr/bin/scim
   XIM_ARGS="-d"
+  PREFERENCE_PROGRAM=/usr/bin/scim-setup
+  SHORT_DESC="SCIM"
 
   gtkimm_exists () {
 	# for multilib check both immodules installed