rpms/gcin/FC-6 .cvsignore, 1.14, 1.15 gcin.spec, 1.20, 1.21 im-client.patch, 1.8, 1.9 newcj3.patch, 1.1, 1.2 sources, 1.14, 1.15

Chung-Yen Chang (candyz) fedora-extras-commits at redhat.com
Thu Nov 29 00:26:22 UTC 2007 

Author: candyz

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	17 Apr 2007 01:54:50 -0000	1.14
+++ .cvsignore	29 Nov 2007 00:25:47 -0000	1.15
@@ -1 +1 @@
-gcin-1.3.4.tar.bz2
+gcin-1.3.7.1.tar.bz2


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/gcin.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gcin.spec	17 Apr 2007 02:21:12 -0000	1.20
+++ gcin.spec	29 Nov 2007 00:25:47 -0000	1.21
@@ -1,10 +1,10 @@
 Name:           gcin
-Version:        1.3.4
-Release:        2%{?dist}
+Version:        1.3.7.1
+Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
-License:        LGPL
+License:        LGPLv2
 URL:            http://cle.linux.org.tw/gcin/
 Source0:        http://cle.linux.org.tw/gcin/download/%{name}-%{version}.tar.bz2
 Source1:        gcin.conf
@@ -21,7 +21,7 @@
 
 BuildRequires:  qt-devel, gtk2-devel, desktop-file-utils
 BuildRequires:  libXtst-devel
-Requires:       gtk2
+Requires:       gtk2, im-chooser
 Requires(post): %{_sbindir}/alternatives, desktop-file-utils
 Requires(preun): %{_sbindir}/alternatives
 Requires(postun): desktop-file-utils
@@ -112,6 +112,11 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Thu Nov 29 2007 Chung-Yen Chang <candyz0416 at gmail.com> - 1.3.7.1-1
+- update license field to LGPLv2
+- add im-chooser to require
+- update to 1.3.7.1
+
 * Tue Apr 17 2007 Chung-Yen Chang <candyz0416 at gmail.com> - 1.3.4-2
 - disable i18n and do not make po
 

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/im-client.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- im-client.patch	17 Apr 2007 02:21:12 -0000	1.8
+++ im-client.patch	29 Nov 2007 00:25:47 -0000	1.9
@@ -1,9 +1,9 @@
-diff -urN gcin-1.3.0.1.orig/gtk-im/Makefile gcin-1.3.0.1/gtk-im/Makefile
---- gcin-1.3.0.1.orig/gtk-im/Makefile	2006-10-14 13:16:16.000000000 +0800
-+++ gcin-1.3.0.1/gtk-im/Makefile	2006-11-23 16:24:35.000000000 +0800
-@@ -20,8 +20,7 @@
- .c.o:
- 	$(CC) -c -fpic $(CFLAGS) -o $@ $<
+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) ;\
@@ -11,9 +11,9 @@
  	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
  	rm -f core.*
  
-diff -urN gcin-1.3.0.1.orig/im-client/Makefile gcin-1.3.0.1/im-client/Makefile
---- gcin-1.3.0.1.orig/im-client/Makefile	2006-11-15 13:04:52.000000000 +0800
-+++ gcin-1.3.0.1/im-client/Makefile	2006-11-23 16:24:35.000000000 +0800
+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)
  
@@ -27,9 +27,9 @@
  	ln -sf $(SOFILEVER) $(SOFILE).1
  	install -d $(includedir)
  	install -m 444 gcin-im-client.h $(includedir)
-diff -urN gcin-1.3.4.orig/Makefile gcin-1.3.4/Makefile
---- gcin-1.3.4.orig/Makefile    2007-04-10 09:56:33.000000000 +0800
-+++ gcin-1.3.4/Makefile 2007-04-12 11:52:46.000000000 +0800
+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 @@
  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
@@ -38,17 +38,12 @@
 +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
  
  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) \
-+     gcin-switch.o gcin-exec-script.o $(gcin1_o) \
-      $(gcin_tsin_o) $(gcin_pho_o) $(gcin_gtab_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 \
-@@ -78,12 +78,11 @@
- 	$(MAKE) -C data
- 	$(MAKE) -C im-client
- 	$(MAKE) -C gtk-im
--	$(MAKE) -C po
-+	#$(MAKE) -C po
+@@ -93,8 +93,7 @@
  	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
  
  gcin:   $(OBJS) $(IMdkitLIB) $(im-srv)
@@ -58,7 +53,7 @@
  	rm -f core.*
  	ln -sf $@ $@.test
  
-@@ -140,9 +139,9 @@
+@@ -155,9 +154,9 @@
  pin-juyin:	$(OBJS_pin_juyin)
  	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
  
@@ -71,7 +66,7 @@
  
  ### making the following as .so actuall makes the RSS larger
  gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
-@@ -167,14 +166,11 @@
+@@ -182,14 +181,11 @@
  ibin:
  	install $(PROGS) $(bindir); \
  	rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
@@ -86,7 +81,7 @@
  	install -d $(bindir)
  	$(MAKE) -C data install
  	$(MAKE) -C im-client install
-@@ -182,13 +178,9 @@
+@@ -197,13 +193,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; \
@@ -100,7 +95,7 @@
  	   install -s $(PROGS) $(bindir); \
  	   rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \
  	fi
-@@ -208,7 +200,7 @@
+@@ -223,7 +215,7 @@
  	$(MAKE) -C qt-im clean
  	$(MAKE) -C man clean
  	$(MAKE) -C menu clean

newcj3.patch:

Index: newcj3.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/newcj3.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- newcj3.patch	15 Nov 2006 06:58:05 -0000	1.1
+++ newcj3.patch	29 Nov 2007 00:25:47 -0000	1.2
@@ -1,5 +1,6 @@
---- gcin-1.2.9/data/Makefile.orig	2006-10-07 11:35:07.000000000 +0800
-+++ gcin-1.2.9/data/Makefile	2006-11-15 14:17:28.000000000 +0800
+diff -urN gcin-1.3.5.orig/data/Makefile gcin-1.3.5/data/Makefile
+--- gcin-1.3.5.orig/data/Makefile	2007-06-30 23:50:56.000000000 +0800
++++ gcin-1.3.5/data/Makefile	2007-10-15 10:13:08.000000000 +0800
 @@ -2,7 +2,7 @@
  
  .SUFFIXES:	.kbmsrc .kbm .cin .gtab
@@ -8,4 +9,4 @@
 +DATA=pho.tab tsin32.idx NewCJ3.gtab \
       cj.gtab ar30.gtab dayi3.gtab pinyin.gtab jyutping.gtab cj5.gtab \
       et.kbm et-asdf.kbm et26.kbm et26-asdf.kbm zo.kbm zo-asdf.kbm \
-      pinyin.kbm pinyin-asdf.kbm \
+      pinyin.kbm pinyin-asdf.kbm dvorak.kbm mitac.kbm \


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	17 Apr 2007 01:54:50 -0000	1.14
+++ sources	29 Nov 2007 00:25:47 -0000	1.15
@@ -1 +1 @@
-20ae604f49fd57c38b9395941ef66cc2  gcin-1.3.4.tar.bz2
+f3c00bcbe0cadb1f6a8bf9de7da0288f  gcin-1.3.7.1.tar.bz2

More information about the fedora-extras-commits mailing list