diff --git a/.cvsignore b/.cvsignore index 961ec34..3713bc5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gcin-1.3.8.tar.bz2 +gcin-1.3.9.tar.bz2 diff --git a/gcin.spec b/gcin.spec index c30b23b..24cf828 100644 --- a/gcin.spec +++ b/gcin.spec @@ -1,5 +1,5 @@ Name: gcin -Version: 1.3.8 +Version: 1.3.9 Release: 1%{?dist} Summary: Input method for Traditional Chinese @@ -31,7 +31,7 @@ Gcin is an input method for Traditional Chinese with a GTK user interface. %prep %setup -q -%patch10 -p1 -b .update +#%patch10 -p1 -b .update %patch1 -p1 -b .im-client %patch2 -p1 -b .qt %patch3 -p1 -b .configure @@ -112,6 +112,9 @@ fi %{_libdir}/libgcin-im-client.so* %changelog +* Wed Jan 30 2008 Chung-Yen Chang - 1.3.9-1 +- update to 1.3.9 + * Wed Jan 23 2008 Chung-Yen Chang - 1.3.8-1 - update to 1.3.8 diff --git a/im-client.patch b/im-client.patch index a30a58a..698afc1 100644 --- a/im-client.patch +++ b/im-client.patch @@ -1,49 +1,25 @@ -diff -urN gcin-1.3.5.orig/gtk-im/Makefile gcin-1.3.5/gtk-im/Makefile ---- gcin-1.3.5.orig/gtk-im/Makefile 2007-03-01 10:04:07.000000000 +0800 -+++ gcin-1.3.5/gtk-im/Makefile 2007-10-15 09:54:56.000000000 +0800 -@@ -24,8 +24,7 @@ - .c.E: - $(CC) -E $(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.2 - $(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS) - rm -f core.* - -diff -urN gcin-1.3.5.orig/im-client/Makefile gcin-1.3.5/im-client/Makefile ---- gcin-1.3.5.orig/im-client/Makefile 2007-03-01 10:04:36.000000000 +0800 -+++ gcin-1.3.5/im-client/Makefile 2007-10-15 09:54:56.000000000 +0800 -@@ -27,9 +27,9 @@ - LOCALLIB=/usr/local/$(LIB) - - install: -- install -d $(gcinlibdir) -- install -m 755 $(SOFILEVER) $(gcinlibdir) -- cd $(gcinlibdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \ -+ install -d $(libdir) -+ install -m 755 $(SOFILEVER) $(libdir) -+ cd $(libdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \ - ln -sf $(SOFILEVER) $(SOFILE).1 - install -d $(includedir) - install -m 444 gcin-im-client.h $(includedir) -diff -urN gcin-1.3.5.orig/Makefile gcin-1.3.5/Makefile ---- gcin-1.3.5.orig/Makefile 2007-07-30 13:20:27.000000000 +0800 -+++ gcin-1.3.5/Makefile 2007-10-15 09:58:31.000000000 +0800 -@@ -8,10 +8,10 @@ +diff -urN gcin-1.3.9.orig/Makefile gcin-1.3.9/Makefile +--- gcin-1.3.9.orig/Makefile 2008-01-27 15:30:17.000000000 +0800 ++++ gcin-1.3.9/Makefile 2008-01-30 22:34:11.000000000 +0800 +@@ -8,7 +8,7 @@ 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 gtab-list.o --GCIN_SO= gcin1.so -+gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o win-pho-near.o win-kbm.o +-GCIN_SO= gcin1.so gcin2.so ++GCIN_SO= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o win-pho-near.o win-kbm.o t2s-lookup.o OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o gcin-icon.o \ -- gcin-switch.o gcin-exec-script.o $(GCIN_SO) pho-play.o \ -+ gcin-switch.o gcin-exec-script.o $(gcin1_o) pho-play.o \ - $(gcin_pho_o) $(gcin_gtab_o) gcin-common.o - - OBJS_TSLEARN=tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \ -@@ -93,8 +93,7 @@ + gcin-switch.o gcin-exec-script.o $(GCIN_SO) pho-play.o \ +@@ -18,7 +18,7 @@ + table-update.o locale.o gcin-settings.o gcin-common.o + OBJS_JUYIN_LEARN=juyin-learn.o locale.o util.o pho-util.o pho-sym.o \ + gcin-settings.o gcin-conf.o table-update.o pinyin.o +-OBJS_sim2trad=sim2trad.o util.o gcin2.so locale.o gcin-conf.o ++OBJS_sim2trad=sim2trad.o util.o t2s-lookup.o locale.o gcin-conf.o + OBJS_phod2a=phod2a.o pho-util.o gcin-conf.o pho-sym.o table-update.o pho-dbg.o locale.o \ + gcin-settings.o util.o + OBJS_tsa2d32=tsa2d32.o gcin-send.o util.o pho-sym.o gcin-conf.o locale.o pho-lookup.o +@@ -95,8 +95,7 @@ if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi gcin: $(OBJS) $(IMdkitLIB) $(im-srv) @@ -53,20 +29,36 @@ diff -urN gcin-1.3.5.orig/Makefile gcin-1.3.5/Makefile rm -f core.* ln -sf $@ $@.test -@@ -155,9 +154,9 @@ +@@ -107,7 +106,6 @@ + $(CC) -o $@ $(OBJS_JUYIN_LEARN) $(LDFLAGS) + rm -f core.* + sim2trad: $(OBJS_sim2trad) +- LD_RUN_PATH=.:$(gcinlibdir) \ + $(CC) -o $@ $(OBJS_sim2trad) $(LDFLAGS) + rm -f core.* + trad2sim: sim2trad +@@ -161,13 +159,13 @@ 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 pinyin.pico win-pho-near.pico win-kbm.pico -gcin1.so: $(gcin1_so) - $(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS) +- +-gcin2_so= t2s-lookup.pico +-gcin2.so: $(gcin2_so) +- $(CC) $(SO_FLAGS) -o $@ $(gcin2_so) $(LDFLAGS) +#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico win-kbm.pico +#gcin1.so: $(gcin1_so) +# $(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS) ++ ++#gcin2_so= t2s-lookup.pico ++#gcin2.so: $(gcin2_so) ++# $(CC) $(SO_FLAGS) -o $@ $(gcin2_so) $(LDFLAGS) ### making the following as .so actuall makes the RSS larger gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico -@@ -182,14 +181,11 @@ +@@ -192,14 +190,11 @@ ibin: install $(PROGS) $(bindir); \ rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim @@ -81,7 +73,7 @@ diff -urN gcin-1.3.5.orig/Makefile gcin-1.3.5/Makefile install -d $(bindir) $(MAKE) -C data install $(MAKE) -C im-client install -@@ -197,13 +193,9 @@ +@@ -207,13 +202,9 @@ if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im install; fi if [ $(prefix) = /usr/local ]; then \ install -m 644 gcin.png /usr/share/icons; \ @@ -95,7 +87,7 @@ diff -urN gcin-1.3.5.orig/Makefile gcin-1.3.5/Makefile install -s $(PROGS) $(bindir); \ rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \ fi -@@ -223,7 +215,7 @@ +@@ -233,7 +224,7 @@ $(MAKE) -C qt-im clean $(MAKE) -C man clean $(MAKE) -C menu clean @@ -104,3 +96,32 @@ diff -urN gcin-1.3.5.orig/Makefile gcin-1.3.5/Makefile rm -f *.o *.E *.db *.pico *.so config.mak tags $(PROGS) $(PROGS_CV) \ $(DATA) .depend gcin.spec trad2sim gcin.spec.tmp gcin.log find . '(' -name '.ted*' -o -name '*~' -o -name 'core.*' -o -name 'vgcore.*' ')' -exec rm {} \; +diff -urN gcin-1.3.9.orig/gtk-im/Makefile gcin-1.3.9/gtk-im/Makefile +--- gcin-1.3.9.orig/gtk-im/Makefile 2007-03-01 10:04:07.000000000 +0800 ++++ gcin-1.3.9/gtk-im/Makefile 2008-01-30 22:33:56.000000000 +0800 +@@ -24,8 +24,7 @@ + .c.E: + $(CC) -E $(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.2 + $(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS) + rm -f core.* + +diff -urN gcin-1.3.9.orig/im-client/Makefile gcin-1.3.9/im-client/Makefile +--- gcin-1.3.9.orig/im-client/Makefile 2007-03-01 10:04:36.000000000 +0800 ++++ gcin-1.3.9/im-client/Makefile 2008-01-30 22:33:56.000000000 +0800 +@@ -27,9 +27,9 @@ + LOCALLIB=/usr/local/$(LIB) + + install: +- install -d $(gcinlibdir) +- install -m 755 $(SOFILEVER) $(gcinlibdir) +- cd $(gcinlibdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \ ++ install -d $(libdir) ++ install -m 755 $(SOFILEVER) $(libdir) ++ cd $(libdir); rm -f $(SOFILE); ln -s $(SOFILEVER) $(SOFILE); \ + ln -sf $(SOFILEVER) $(SOFILE).1 + install -d $(includedir) + install -m 444 gcin-im-client.h $(includedir) diff --git a/sources b/sources index 8f7b1ae..9dd089c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1b3bc05ca9ae56eae2343b15af52d0b8 gcin-1.3.8.tar.bz2 +4003d942beaba62547346edb57bfb29f gcin-1.3.9.tar.bz2