rpms/gcin/devel gcin-1.4.2-gtk-immodules-lang.patch, NONE, 1.1 gcin.conf, 1.2, 1.3 gcin.spec, 1.36, 1.37 gcin_update.patch, 1.4, NONE

[Jens Petersen]

Author: petersen

Update of /cvs/pkgs/rpms/gcin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22724

Modified Files:
	gcin.conf gcin.spec 
Added Files:
	gcin-1.4.2-gtk-immodules-lang.patch 
Removed Files:
	gcin_update.patch 
Log Message:
- add gcin-1.4.2-gtk-immodules-lang.patch to not enable gcin gtk immodule for all
  langs (#453093)
- spec file cleanup
- update xinput conf file to set icon and setup program



gcin-1.4.2-gtk-immodules-lang.patch:

--- NEW FILE gcin-1.4.2-gtk-immodules-lang.patch ---
diff -up gcin-1.4.2/gtk-im/imgcin.c.gtk-immodules gcin-1.4.2/gtk-im/imgcin.c
--- gcin-1.4.2/gtk-im/imgcin.c.gtk-immodules	2007-01-22 11:58:49.000000000 +1000
+++ gcin-1.4.2/gtk-im/imgcin.c	2008-10-21 12:30:21.000000000 +1000
@@ -27,7 +27,7 @@ static const GtkIMContextInfo gcin_info 
   N_("gcin Input Method"),            /* Human readable name */
   GETTEXT_PACKAGE,		   /* Translation domain */
   GTK_LOCALEDIR,		   /* Dir for bindtextdomain (not strictly needed for "gtk+") */
-  "*"		           /* Languages for which this module is the default */
+  ""		           /* Languages for which this module is the default */
 //  "zh_TW"		           /* Languages for which this module is the default */
 };
 


Index: gcin.conf
===================================================================
RCS file: /cvs/pkgs/rpms/gcin/devel/gcin.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gcin.conf	27 Jun 2008 08:09:44 -0000	1.2
+++ gcin.conf	21 Oct 2008 03:38:23 -0000	1.3
@@ -1,5 +1,8 @@
 XIM=gcin
 XIM_PROGRAM=/usr/bin/gcin
 XIM_ARGS="-x gcin"
+ICON=/usr/share/icons/gcin/gcin.png
+PREFERENCE_PROGRAM=/usr/bin/gcin-setup
+SHORT_DESC="gcin"
 GTK_IM_MODULE=gcin
 QT_IM_MODULE=gcin


Index: gcin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcin/devel/gcin.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gcin.spec	29 Sep 2008 01:53:56 -0000	1.36
+++ gcin.spec	21 Oct 2008 03:38:24 -0000	1.37
@@ -1,6 +1,6 @@
 Name:           gcin
 Version:        1.4.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -15,7 +15,7 @@
 Patch3:         configure.patch
 Patch4:         newcj3.patch
 Patch5:         gcin_gtab.patch
-Patch10:        gcin_update.patch
+Patch6:         gcin-1.4.2-gtk-immodules-lang.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -31,26 +31,23 @@
 
 %prep
 %setup -q
-#%patch10 -p1 -b .update
 %patch1 -p1 -b .im-client
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
 %patch4 -p1 -b .newcj3
 %patch5 -p1 -b .gtab
+%patch6 -p1 -b .gtk-immodules
 #cp -f gcinicon/gtab.list data/
 #cp -f gcinicon/*.png icons/
 find . -name \*.h -o -name \*.c | xargs chmod ugo-x 
 sed -i.strip -e 's|install[ \t][ \t]*-s|install|' Makefile
-echo "#!/bin/bash" > scripts/noseeing-inst.tmp
-cat scripts/noseeing-inst >> scripts/noseeing-inst.tmp
-cat scripts/noseeing-inst.tmp > scripts/noseeing-inst
 cp -f %{SOURCE3} data/
 
 %build
-./configure --prefix=%{_prefix} --libdir=%{_libdir}
+%configure
 perl -pi -e "s/^(OPTFLAGS.*=)/\1 %{optflags} /" config.mak
+# fixme: explain how %%{?_smp_mflags} breaks build?
 make
-#make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -112,6 +109,12 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Tue Oct 21 2008 Jens Petersen <petersen at redhat.com> - 1.4.2-4
+- add gcin-1.4.2-gtk-immodules-lang.patch to not enable gcin gtk immodule for all
+  langs (#453093)
+- spec file cleanup
+- update xinput conf file to set icon and setup program
+
 * Mon Sep 29 2008 Jens Petersen <petersen at redhat.com> - 1.4.2-3
 - update im-client.patch to fix patch fuzz
 


--- gcin_update.patch DELETED ---