[gcin] - Fix gtk-im module Makefile issue

[paragn]

commit 5fa6c00e57ca7ee251c29f851348c609ecbb13dc
Author: paragn <paragn at fedoraproject.org>
Date:   Tue Sep 7 11:00:02 2010 +0530

    - Fix gtk-im module Makefile issue

 gcin-1.5.5-gtk-im-Makefile-fix.patch |   17 +++++++++++++++++
 gcin.spec                            |    6 +++++-
 newcj3.patch                         |   10 +++++-----
 sources                              |    2 --
 4 files changed, 27 insertions(+), 8 deletions(-)
---
diff --git a/gcin-1.5.5-gtk-im-Makefile-fix.patch b/gcin-1.5.5-gtk-im-Makefile-fix.patch
new file mode 100644
index 0000000..c645525
--- /dev/null
+++ b/gcin-1.5.5-gtk-im-Makefile-fix.patch
@@ -0,0 +1,17 @@
+--- gcin-1.5.5.orig/gtk-im/Makefile	2010-09-07 10:09:11.000000000 +0530
++++ gcin-1.5.5/gtk-im/Makefile	2010-09-07 10:36:59.000000000 +0530
+@@ -26,11 +26,12 @@
+ 
+ all:	im-gcin.so im-gcin-cur.so
+ 
+-im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.2.1
++im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
++	export LD_RUN_PATH=$(gcinlibdir) ;\
+ 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
+ 	rm -f core.*
+ 
+-im-gcin-cur.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.2.1
++im-gcin-cur.so:     $(OBJS) ../im-client/libgcin-im-client.so
+ 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
+ 	rm -f core.*
+ 
diff --git a/gcin.spec b/gcin.spec
index 69b9c2a..83c25da 100644
--- a/gcin.spec
+++ b/gcin.spec
@@ -17,7 +17,9 @@ Patch4:         newcj3.patch
 Patch5:         gcin_gtab.patch
 Patch6:         gcin-1.4.2-gtk-immodules-lang.patch
 Patch7:         gtk-deprecated.patch
-
+#This is backported from current 1.5.6 development
+Patch8:         gcin-1.5.5-gtk-im-Makefile-fix.patch
+ 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt3-devel, gtk2-devel, desktop-file-utils
@@ -39,6 +41,7 @@ Gcin is an input method for Traditional Chinese with a GTK user interface.
 %patch4 -p1 -b .newcj3
 %patch5 -p1 -b .gtab
 %patch7 -p1 -b .gtk
+%patch8 -p1 -b .gtk-im
 #%patch6 -p1 -b .gtk-immodules
 #cp -f gcinicon/gtab.list data/
 #cp -f gcinicon/*.png icons/
@@ -115,6 +118,7 @@ fi
 %changelog
 * Tue Sep 07 2010 Parag Nemade <paragn AT fedoraproject.org> - 1.5.5-3
 - update to latest stable release 1.5.5
+- Fix gtk-im module Makefile issue 
 
 * Tue Jun 29 2010 Chung-Yen Chang <candyz0416 at gmail.com> - 1.5.5.pre3-2
 - update to 1.5.5.pre3
diff --git a/newcj3.patch b/newcj3.patch
index 899bed4..aee0ffc 100644
--- a/newcj3.patch
+++ b/newcj3.patch
@@ -1,9 +1,9 @@
-diff -urN gcin-1.4.3.orig/data/Makefile gcin-1.4.3/data/Makefile
---- gcin-1.4.3.orig/data/Makefile	2009-01-12 15:05:35.000000000 +0800
-+++ gcin-1.4.3/data/Makefile	2009-01-23 10:05:04.000000000 +0800
-@@ -2,7 +2,7 @@
+diff -urN gcin-1.5.5.orig/data/Makefile gcin-1.5.5/data/Makefile
+--- gcin-1.5.5.orig/data/Makefile	2010-06-30 18:28:36.000000000 +0530
++++ gcin-1.5.5/data/Makefile	2010-09-07 10:12:02.000000000 +0530
+@@ -4,7 +4,7 @@
+ CFLAGS= -DUNIX=1 $(WALL) $(OPTFLAGS) $(GTKINC) -I.. -DDEBUG="0$(GCIN_DEBUG)" \
  
- .SUFFIXES:	.kbmsrc .kbm .cin .gtab
  
 -DATA=pho.tab tsin32.idx \
 +DATA=pho.tab tsin32.idx NewCJ3.gtab \
diff --git a/sources b/sources
index e4d07ec..008710e 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
 09e7a74adc20ccba88336321441bcb66  gcin-1.5.5.pre3.tar.bz2
-102178c27280ee20dea62bbdd90badcd  sources
-413e6f3496994d1c732344178bd78bb1  gcin-1.5.5.tar.bz2