rpms/gcin/FC-3 .cvsignore, 1.7, 1.8 gcin.spec, 1.10, 1.11 im-client.patch, 1.1, 1.2 sources, 1.7, 1.8

[Chung-Yen Chang (candyz)]

Author: candyz

Update of /cvs/extras/rpms/gcin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3372

Modified Files:
	.cvsignore gcin.spec im-client.patch sources 
Log Message:
update to 1.2.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Oct 2006 01:18:27 -0000	1.7
+++ .cvsignore	20 Oct 2006 08:31:38 -0000	1.8
@@ -1 +1 @@
-gcin-1.2.7.tar.bz2
+gcin-1.2.8.tar.bz2


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/gcin.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gcin.spec	9 Oct 2006 01:18:27 -0000	1.10
+++ gcin.spec	20 Oct 2006 08:31:38 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           gcin
-Version:        1.2.7
+Version:        1.2.8
 Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
@@ -12,7 +12,6 @@
 Patch1:         im-client.patch
 Patch2:         qt.patch
 Patch3:         configure.patch
-Patch4:         gcin-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel, gtk2-devel, desktop-file-utils
@@ -29,11 +28,13 @@
 %patch1 -p1 -b .im-client
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
-%patch4 -p1 -b .x86_64
 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
 
 %build
 ./configure --prefix=%{_prefix} --libdir=%{_libdir}
@@ -48,6 +49,9 @@
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinput.d/gcin
 rm -f $RPM_BUILD_ROOT/%{_datadir}/control-center-2.0/capplets/gcin-setup.desktop
 rm -f $RPM_BUILD_ROOT/%{_includedir}/gcin-im-client.h
+cd $RPM_BUILD_ROOT/%{_libdir}
+ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so.1
+cd -
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/Changelog
 rm -f $RPM_BUILD_ROOT/%{_docdir}/gcin-%{version}/README
 desktop-file-install \
@@ -94,9 +98,12 @@
 %{_libdir}/menu/gcin*
 %{_libdir}/gtk-2.0/immodules/im-gcin.so
 %{_libdir}/qt-3.3/plugins/inputmethods/libqgcin.so
-%{_libdir}/libgcin-im-client.so
+%{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Fri Oct 20 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.8-1
+- update to 1.2.8
+
 * Mon Oct 09 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.7-1
 - update to 1.2.7
 

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/im-client.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- im-client.patch	24 Aug 2006 07:54:11 -0000	1.1
+++ im-client.patch	20 Oct 2006 08:31:38 -0000	1.2
@@ -1,5 +1,5 @@
---- gcin-1.2.1/im-client/Makefile.orig	2006-05-01 17:57:43.000000000 +0800
-+++ gcin-1.2.1/im-client/Makefile	2006-08-16 18:25:04.000000000 +0800
+--- gcin-1.2.8/im-client/Makefile.im-client	2006-10-14 13:12:51.000000000 +0800
++++ gcin-1.2.8/im-client/Makefile	2006-10-20 09:48:35.000000000 +0800
 @@ -6,7 +6,7 @@
          -DCLIENT_LIB=1 -DGCIN_BIN_DIR=\"$(GCIN_BIN_DIR)\" \
          -DDEBUG="0$(GCIN_DEBUG)" -DGCIN_TABLE_DIR=\"$(GCIN_TABLE_DIR)\" \
@@ -9,7 +9,28 @@
  
  .c.E:
  	$(CC) $(CFLAGS) -E -o $@ $<
-@@ -43,6 +43,9 @@
+@@ -14,15 +14,16 @@
+ .c.o:
+ 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
+ 
+-libgcin-im-client.so:   $(OBJS)
+-	$(CC) $(SO_FLAGS) $(OBJS) -o $@
++libgcin-im-client.so.1.0.1:   $(OBJS)
++	$(CC) $(SO_FLAGS) -Wl,-soname,libgcin-im-client.so.1 $(OBJS) -o $@
++	ln -sf libgcin-im-client.so.1.0.1 libgcin-im-client.so
+ 	$(MAKE) -C ../gtk-im
+ 
+ LOCALLIB=/usr/local/$(LIB)
+ 
+ install:
+-	install -d $(gcinlibdir)
+-	install -m 755 libgcin-im-client.so $(gcinlibdir)
++	install -d $(libdir)
++	install -m 755 libgcin-im-client.so.1.0.1 $(libdir)
+ 	install -d $(includedir); \
+ 	install -m 444 gcin-im-client.h $(includedir)
+ 
+@@ -35,6 +36,9 @@
  im-addr.o: ../im-srv/im-addr.c
  	$(CC) -c -fpic $(CFLAGS) -o $@ $<
  
@@ -19,3 +40,70 @@
  clean:
  	rm -f *.o *.so *~ *.E *.db config.mak tags core.* .depend
  
+--- gcin-1.2.8/Makefile.im-client	2006-10-19 15:33:27.000000000 +0800
++++ gcin-1.2.8/Makefile	2006-10-20 09:15:50.000000000 +0800
+@@ -8,10 +8,11 @@
+ gcin_pho_o = win-pho.o pho.o pho-util.o pho-sym.o table-update.o pho-dbg.o
+ gcin_gtab_o = gtab.o win-gtab.o gtab-util.o
+ 
+-GCIN_SO= gcin1.so
++gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o
++#GCIN_SO= gcin1.so
+ 
+ OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o \
+-     gcin-switch.o tray.o eggtrayicon.o $(GCIN_SO) \
++     gcin-switch.o tray.o eggtrayicon.o $(gcin1_o) \
+      $(gcin_tsin_o) $(gcin_pho_o) $(gcin_gtab_o)
+ 
+ OBJS_TSLEARN=tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \
+@@ -70,8 +71,7 @@
+ 	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
+ 
+ gcin:   $(OBJS) $(IMdkitLIB) $(im-srv)
+-	export LD_RUN_PATH=.:$(gcinlibdir) ;\
+-	$(CC) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(im-srv) -lXtst $(LDFLAGS) -L/usr/X11R6/lib
++	$(CC) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(im-srv) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
+ 	rm -f core.*
+ 	ln -sf $@ $@.test
+ 
+@@ -124,9 +124,9 @@
+ pin-juyin:	$(OBJS_pin_juyin)
+ 	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
+ 
+-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
+-gcin1.so: $(gcin1_so)
+-	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
++#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico
++#gcin1.so: $(gcin1_so)
++#	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
+ 
+ ### making the following as .so actuall makes the RSS larger
+ gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
+@@ -151,15 +151,12 @@
+ ibin:
+ 	install $(PROGS) $(bindir); \
+ 	rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
+-	install $(GCIN_SO) $(gcinlibdir)
+ 
+ install:
+ 	install -d $(datadir)/icons
+ 	install gcin.png $(datadir)/icons
+ 	install -d $(GCIN_ICON_DIR_i)
+ 	install -m 644 icons/* $(GCIN_ICON_DIR_i)
+-	install -d $(gcinlibdir)
+-	install $(GCIN_SO) $(gcinlibdir)
+ 	install -d $(bindir)
+ 	$(MAKE) -C data install
+ 	$(MAKE) -C im-client install
+--- gcin-1.2.8/gtk-im/Makefile.orig	2006-10-14 13:16:16.000000000 +0800
++++ gcin-1.2.8/gtk-im/Makefile	2006-10-20 08:58:46.000000000 +0800
+@@ -20,8 +20,7 @@
+ .c.o:
+ 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
+ 
+-im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so
+-	export LD_RUN_PATH=$(gcinlibdir) ;\
++im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
+ 	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
+ 	rm -f core.*
+ 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	9 Oct 2006 01:18:27 -0000	1.7
+++ sources	20 Oct 2006 08:31:38 -0000	1.8
@@ -1 +1 @@
-ccd064960c5eba861020ed7efc640f7e  gcin-1.2.7.tar.bz2
+d4940efa38b3b3206f4d936104e2b37c  gcin-1.2.8.tar.bz2