rpms/scim/devel scim-1.4.7-translation-update-431995.patch, NONE, 1.1 .cvsignore, 1.24, 1.25 scim.spec, 1.115, 1.116 sources, 1.25, 1.26 scim-1.4.7-ja-sinhala-236715.patch, 1.1, NONE

Tue Apr 8 14:31:43 UTC 2008

Author: petersen

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

Modified Files:
	.cvsignore scim.spec sources 
Added Files:
	scim-1.4.7-translation-update-431995.patch 
Removed Files:
	scim-1.4.7-ja-sinhala-236715.patch 
Log Message:
- added translations for es, gu, hi, kn, ml, mr, pt_BR, ru, ta, te
  (Red Hat L10n Team)
- added translations for sk and vi from upstream
- updated translations for de, it, ja, ko, pa, zh_CN (Red Hat L10n Team)
- scim-1.4.7-ja-sinhala-236715.patch is no longer required
Resolves: RH#431995


scim-1.4.7-translation-update-431995.patch:

--- NEW FILE scim-1.4.7-translation-update-431995.patch ---
diff -u scim-1.4.7/configure.ac\~ scim-1.4.7/configure.ac
--- scim-1.4.7/configure.ac~	2007-06-27 00:31:57.000000000 +1000
+++ scim-1.4.7/configure.ac	2008-04-08 23:58:50.000000000 +1000
@@ -65,7 +65,7 @@
 AM_CONFIG_HEADER([config.h])
 
 # Init gettext
-ALL_LINGUAS="zh_CN zh_TW ja ko de fr it cs pa fi sv nl"
+ALL_LINGUAS="as bn_IN cs de es fi fr gu hi it ja kn ko ml mr nl pa pt_BR ru sk sv ta te vi zh_CN zh_TW"
 AM_GNU_GETTEXT
 
 # Init libtool


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	27 Jun 2007 08:49:10 -0000	1.24
+++ .cvsignore	8 Apr 2008 14:30:52 -0000	1.25
@@ -1,2 +1,3 @@
 scim-icons-0.7.tar.gz
 scim-1.4.7.tar.gz
+scim-1.4.7_translation-update.tar.bz2


Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/scim.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- scim.spec	2 Apr 2008 08:14:17 -0000	1.115
+++ scim.spec	8 Apr 2008 14:30:52 -0000	1.116
@@ -3,7 +3,7 @@
 
 Name:      scim
 Version:   1.4.7
-Release:   21%{?dist}
+Release:   22%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPLv2+
@@ -14,6 +14,7 @@
 Source2:   scim-icons-0.7.tar.gz
 Source3:   scim-system-config
 Source4:   scim-system-global
+Source5:   scim-1.4.7_translation-update.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gtk2-devel, libXt-devel
@@ -37,12 +38,12 @@
 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
 Patch19:   scim-1.4.7-remove-locale.patch
 Patch20:   scim-1.4.7-fix-fallback.patch
 Patch21:   scim-1.4.7-fix-capslock.patch
 Patch22:   scim-1.4.7-fix-gdm.patch
 Patch23:   scim-1.4.7-remove-help-frame.patch
+Patch24:   scim-1.4.7-translation-update-431995.patch
 
 %description
 SCIM is a user friendly and full featured input method user interface and
@@ -149,7 +150,19 @@
 
 
 %prep
-%setup -q %{?snapdate:-n %{name}-%{version}-%{snapdate}} -a2
+%setup -q %{?snapdate:-n %{name}-%{version}-%{snapdate}} -a2 -a5
+
+cp -p scim-icons/icons/*.png data/icons
+cp -p scim-icons/pixmaps/*.png data/pixmaps
+
+# use our system config & global file
+mv configs/config{,.orig} 
+cp -p %{SOURCE3} configs/config
+mv configs/global{,.orig} 
+cp -p %{SOURCE4} configs/global
+
+cp -p scim_translations/*.po po
+
 %patch7 -p1 -b .7-emacs-ccmode~
 %patch8 -p1 -b .8-hotkey~
 %patch9 -p1 -b .9-icon-size~
@@ -157,28 +170,21 @@
 %patch12 -p1 -b .12-unloadsegfault~
 %patch15 -p1 -b .15-key-snooper~
 %patch17 -p1 -b .17-rpath~
-%patch18 -p1 -b .18-sinhala~
 %patch19 -p1 -b .19-remove-locale~
 %patch20 -p1 -b .20-fix-fallback
 %patch21 -p1 -b .21-fix-capslock
 %patch22 -p1 -b .22-fix-gdm
 %patch23 -p1 -b .23-help-frame
+%patch24 -p1 -b .24-trans
+
 
 %if %{snapshot}
 ./bootstrap
 %else
-# patch1 and patch17 touch configure.ac and Makefile.am
+# patch1, patch17, patch24 touch configure.ac and Makefile.am
 autoreconf
 %endif
 
-cp -p scim-icons/icons/*.png data/icons
-cp -p scim-icons/pixmaps/*.png data/pixmaps
-
-# use our system config & global file
-mv configs/config{,.orig} 
-cp -p %{SOURCE3} configs/config
-mv configs/global{,.orig} 
-cp -p %{SOURCE4} configs/global
 
 %build
 %configure --disable-static --enable-ld-version-script
@@ -302,6 +308,13 @@
 
 
 %changelog
+* Wed Apr  9 2008 Jens Petersen <petersen at redhat.com> - 1.4.7-22
+- added translations for es, gu, hi, kn, ml, mr, pt_BR, ru, ta, te
+  (Red Hat L10n Team)
+- added translations for sk and vi from upstream
+- updated translations for de, it, ja, ko, pa, zh_CN (Red Hat L10n Team)
+- scim-1.4.7-ja-sinhala-236715.patch is no longer required
+
 * Wed Apr 02 2008 Huang Peng <phuang at redhat.com> - 1.4.7-21
 - Update scim.conf to check qtimm in qt4 folder for qtimm.
 - Re-add scim-1.4.7-fix-capslock.patch to fix bug #431222.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	27 Jun 2007 08:49:10 -0000	1.25
+++ sources	8 Apr 2008 14:30:52 -0000	1.26
@@ -1,2 +1,3 @@
 2308b7fc4a5f981d08c7f00c90a7291b  scim-icons-0.7.tar.gz
 b76a725e5d5d83fe111ba23bf8b01adc  scim-1.4.7.tar.gz
+2e23aae84d2be81cd2111fb3508c21a3  scim-1.4.7_translation-update.tar.bz2


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


