rpms/gcin/F-9 .cvsignore, 1.22, 1.23 gcin.spec, 1.37, 1.38 im-client.patch, 1.12, 1.13 sources, 1.22, 1.23

Chung-Yen Chang candyz at fedoraproject.org
Thu May 7 07:37:30 UTC 2009


Author: candyz

Update of /cvs/extras/rpms/gcin/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11197

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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/F-9/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	4 Feb 2009 07:48:53 -0000	1.22
+++ .cvsignore	7 May 2009 07:36:59 -0000	1.23
@@ -1 +1 @@
-gcin-1.4.4.tar.bz2
+gcin-1.4.5.tar.bz2


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/F-9/gcin.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- gcin.spec	5 Feb 2009 01:37:48 -0000	1.37
+++ gcin.spec	7 May 2009 07:36:59 -0000	1.38
@@ -1,6 +1,6 @@
 Name:           gcin
-Version:        1.4.4
-Release:        4%{?dist}
+Version:        1.4.5
+Release:        2%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -104,14 +104,24 @@ fi
 %{_datadir}/icons/gcin/
 %{_datadir}/icons/gcin*.png
 %{_mandir}/*/*
+%dir %{_libdir}/menu
 %{_libdir}/menu/gcin*
 %{_libdir}/gtk-2.0/immodules/im-gcin.so
 %{_libdir}/qt-3.3/plugins/inputmethods/libqgcin.so
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
-* Thu Feb 05 2009 Chung-Yen Chang <candyz0416 at gmail.com> - 1.4.4-4
-- rebuild
+* Thu May 07 2009 Chung-Yen Chang <candyz0416 at gmail.com> - 1.4.5-2
+- remove gtk_bug_fix.so and rebuild
+
+* Thu May 07 2009 Chung-Yen Chang <candyz0416 at gmail.com> - 1.4.5-1
+- update to 1.4.5
+
+* Tue Mar 31 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.4.4-5
+- fix unowned directory (#473616)
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Wed Feb 04 2009 Chung-Yen Chang <candyz0416 at gmail.com> - 1.4.4-3
 - rename Changelog to Changelog.html

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/F-9/im-client.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- im-client.patch	4 Feb 2009 07:48:53 -0000	1.12
+++ im-client.patch	7 May 2009 07:36:59 -0000	1.13
@@ -1,12 +1,12 @@
-diff -urN gcin-1.4.3.orig/Makefile gcin-1.4.3/Makefile
---- gcin-1.4.3.orig/Makefile	2009-01-12 22:48:43.000000000 +0800
-+++ gcin-1.4.3/Makefile	2009-01-23 09:42:23.000000000 +0800
+diff -urN gcin-1.4.5.orig/Makefile gcin-1.4.5/Makefile
+--- gcin-1.4.5.orig/Makefile	2009-03-29 21:32:52.000000000 +0800
++++ gcin-1.4.5/Makefile	2009-05-07 14:50:13.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 gtab-buf.o
  
--GCIN_SO= gcin1.so gcin2.so
-+GCIN_SO= intcode.o win-int.o win-message.o win-sym.o win-inmd-switch.o pinyin.o win-pho-near.o win-kbm.o tsin-char.o anthy.o t2s-lookup.o
+-GCIN_SO= gcin1.so gcin2.so gtk_bug_fix.so
++GCIN_SO= intcode.o win-int.o win-message.o win-sym.o win-inmd-switch.o pinyin.o win-pho-near.o win-kbm.o tsin-char.o anthy.o t2s-lookup.o gtk_bug_fix.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 cache.o \
@@ -19,7 +19,16 @@ diff -urN gcin-1.4.3.orig/Makefile gcin-
  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
-@@ -96,8 +96,7 @@
+@@ -94,7 +94,7 @@
+ PROGS_SYM=trad2sim
+ PROGS_CV=kbmcv pin-juyin
+ 
+-all:	$(PROGS) trad2sim $(DATA) $(PROGS_CV) gcin.spec gtk_bug_fix.so
++all:	$(PROGS) trad2sim $(DATA) $(PROGS_CV) gcin.spec
+ 	$(MAKE) -C data
+ 	$(MAKE) -C im-client
+ 	$(MAKE) -C gtk-im
+@@ -105,8 +105,7 @@
  	if [ $(QT4_IM) = 'Y' ]; then $(MAKE) -C qt4-im; fi
  
  gcin:   $(OBJS) $(IMdkitLIB) $(im-srv)
@@ -29,7 +38,7 @@ diff -urN gcin-1.4.3.orig/Makefile gcin-
  	rm -f core.*
  	ln -sf $@ $@.test
  
-@@ -108,7 +107,6 @@
+@@ -117,7 +116,6 @@
  	$(CC) -o $@ $(OBJS_JUYIN_LEARN) $(LDFLAGS)
  	rm -f core.*
  sim2trad:        $(OBJS_sim2trad)
@@ -37,13 +46,17 @@ diff -urN gcin-1.4.3.orig/Makefile gcin-
  	$(CC) -o $@ $(OBJS_sim2trad) $(LDFLAGS)
  	rm -f core.*
  trad2sim:	sim2trad
-@@ -167,16 +165,6 @@
+@@ -176,22 +174,8 @@
  #	$(CC) -o $@ $(OBJS_ANTHY) -lanthydic $(LDFLAGS)
  #	$(CC) -o $@ $(OBJS_ANTHY) $(LDFLAGS)
  
 -gcin1_so= intcode.pico win-int.pico win-message.pico win-sym.pico \
--win-inmd-switch.pico pinyin.pico win-pho-near.pico win-kbm.pico tsin-char.pico \
--anthy.pico
+-win-inmd-switch.pico pinyin.pico win-pho-near.pico win-kbm.pico tsin-char.pico
+-
+-ifeq ($(USE_ANTHY),Y)
+-gcin1_so += anthy.pico
+-endif
+-
 -gcin1.so: $(gcin1_so)
 -	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
 -
@@ -51,10 +64,14 @@ diff -urN gcin-1.4.3.orig/Makefile gcin-
 -gcin2.so: $(gcin2_so)
 -	$(CC) $(SO_FLAGS) -o $@ $(gcin2_so) $(LDFLAGS)
 -
+-gtk_bug_fix.so: gtk_bug_fix.pico
+-	$(CC) $(SO_FLAGS) -o $@ gtk_bug_fix.pico
++#gtk_bug_fix.so: gtk_bug_fix.pico
++#	$(CC) $(SO_FLAGS) -o $@ gtk_bug_fix.pico
+ 
  ### making the following as .so actuall makes the RSS larger
  gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
- gcin-gtab.so: $(gcin_gtab_so)
-@@ -199,14 +187,11 @@
+@@ -215,14 +199,11 @@
  ibin:
  	install $(PROGS) $(bindir); \
  	rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
@@ -69,7 +86,7 @@ diff -urN gcin-1.4.3.orig/Makefile gcin-
  	install -d $(bindir)
  	$(MAKE) -C data install
  	$(MAKE) -C im-client install
-@@ -215,13 +200,9 @@
+@@ -231,13 +212,9 @@
  	if [ $(QT4_IM) = 'Y' ]; then $(MAKE) -C qt4-im install; fi
  	if [ $(prefix) = /usr/local ]; then \
  	   install -m 644 gcin.png /usr/share/icons; \
@@ -83,7 +100,7 @@ diff -urN gcin-1.4.3.orig/Makefile gcin-
  	   install -s $(PROGS) $(bindir); \
  	   rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \
  	fi
-@@ -242,7 +223,7 @@
+@@ -258,7 +235,7 @@
  	$(MAKE) -C qt4-im clean
  	$(MAKE) -C man clean
  	$(MAKE) -C menu clean
@@ -92,15 +109,15 @@ diff -urN gcin-1.4.3.orig/Makefile gcin-
  	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.4.3.orig/Makefile.gcin gcin-1.4.3/Makefile.gcin
---- gcin-1.4.3.orig/Makefile.gcin	2009-01-12 22:48:43.000000000 +0800
-+++ gcin-1.4.3/Makefile.gcin	2009-01-23 09:42:23.000000000 +0800
+diff -urN gcin-1.4.5.orig/Makefile.gcin gcin-1.4.5/Makefile.gcin
+--- gcin-1.4.5.orig/Makefile.gcin	2009-03-29 21:32:52.000000000 +0800
++++ gcin-1.4.5/Makefile.gcin	2009-05-07 14:49:23.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 gtab-buf.o
  
--GCIN_SO= gcin1.so gcin2.so
-+GCIN_SO= intcode.o win-int.o win-message.o win-sym.o win-inmd-switch.o pinyin.o win-pho-near.o win-kbm.o tsin-char.o anthy.o t2s-lookup.o
+-GCIN_SO= gcin1.so gcin2.so gtk_bug_fix.so
++GCIN_SO= intcode.o win-int.o win-message.o win-sym.o win-inmd-switch.o pinyin.o win-pho-near.o win-kbm.o tsin-char.o anthy.o t2s-lookup.o gtk_bug_fix.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 cache.o \
@@ -113,7 +130,7 @@ diff -urN gcin-1.4.3.orig/Makefile.gcin 
  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
-@@ -96,8 +96,7 @@
+@@ -105,8 +105,7 @@
  	if [ $(QT4_IM) = 'Y' ]; then $(MAKE) -C qt4-im; fi
  
  gcin:   $(OBJS) $(IMdkitLIB) $(im-srv)
@@ -123,7 +140,7 @@ diff -urN gcin-1.4.3.orig/Makefile.gcin 
  	rm -f core.*
  	ln -sf $@ $@.test
  
-@@ -108,7 +107,6 @@
+@@ -117,7 +116,6 @@
  	$(CC) -o $@ $(OBJS_JUYIN_LEARN) $(LDFLAGS)
  	rm -f core.*
  sim2trad:        $(OBJS_sim2trad)
@@ -131,13 +148,17 @@ diff -urN gcin-1.4.3.orig/Makefile.gcin 
  	$(CC) -o $@ $(OBJS_sim2trad) $(LDFLAGS)
  	rm -f core.*
  trad2sim:	sim2trad
-@@ -167,16 +165,6 @@
+@@ -176,22 +174,8 @@
  #	$(CC) -o $@ $(OBJS_ANTHY) -lanthydic $(LDFLAGS)
  #	$(CC) -o $@ $(OBJS_ANTHY) $(LDFLAGS)
  
 -gcin1_so= intcode.pico win-int.pico win-message.pico win-sym.pico \
--win-inmd-switch.pico pinyin.pico win-pho-near.pico win-kbm.pico tsin-char.pico \
--anthy.pico
+-win-inmd-switch.pico pinyin.pico win-pho-near.pico win-kbm.pico tsin-char.pico
+-
+-ifeq ($(USE_ANTHY),Y)
+-gcin1_so += anthy.pico
+-endif
+-
 -gcin1.so: $(gcin1_so)
 -	$(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
 -
@@ -145,10 +166,14 @@ diff -urN gcin-1.4.3.orig/Makefile.gcin 
 -gcin2.so: $(gcin2_so)
 -	$(CC) $(SO_FLAGS) -o $@ $(gcin2_so) $(LDFLAGS)
 -
+-gtk_bug_fix.so: gtk_bug_fix.pico
+-	$(CC) $(SO_FLAGS) -o $@ gtk_bug_fix.pico
++#gtk_bug_fix.so: gtk_bug_fix.pico
++#	$(CC) $(SO_FLAGS) -o $@ gtk_bug_fix.pico
+ 
  ### making the following as .so actuall makes the RSS larger
  gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
- gcin-gtab.so: $(gcin_gtab_so)
-@@ -199,14 +187,11 @@
+@@ -215,14 +199,11 @@
  ibin:
  	install $(PROGS) $(bindir); \
  	rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
@@ -163,7 +188,7 @@ diff -urN gcin-1.4.3.orig/Makefile.gcin 
  	install -d $(bindir)
  	$(MAKE) -C data install
  	$(MAKE) -C im-client install
-@@ -215,13 +200,9 @@
+@@ -231,13 +212,9 @@
  	if [ $(QT4_IM) = 'Y' ]; then $(MAKE) -C qt4-im install; fi
  	if [ $(prefix) = /usr/local ]; then \
  	   install -m 644 gcin.png /usr/share/icons; \
@@ -177,7 +202,7 @@ diff -urN gcin-1.4.3.orig/Makefile.gcin 
  	   install -s $(PROGS) $(bindir); \
  	   rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \
  	fi
-@@ -242,7 +223,7 @@
+@@ -258,7 +235,7 @@
  	$(MAKE) -C qt4-im clean
  	$(MAKE) -C man clean
  	$(MAKE) -C menu clean
@@ -186,22 +211,27 @@ diff -urN gcin-1.4.3.orig/Makefile.gcin 
  	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.4.3.orig/gtk-im/Makefile gcin-1.4.3/gtk-im/Makefile
---- gcin-1.4.3.orig/gtk-im/Makefile	2007-03-01 10:04:07.000000000 +0800
-+++ gcin-1.4.3/gtk-im/Makefile	2009-01-23 09:34:06.000000000 +0800
-@@ -24,8 +24,7 @@
- .c.E:
- 	$(CC) -E $(CFLAGS) -o $@ $<
+diff -urN gcin-1.4.5.orig/gtk-im/Makefile gcin-1.4.5/gtk-im/Makefile
+--- gcin-1.4.5.orig/gtk-im/Makefile	2009-04-13 10:47:24.000000000 +0800
++++ gcin-1.4.5/gtk-im/Makefile	2009-05-07 14:49:23.000000000 +0800
+@@ -26,12 +26,11 @@
+ 
+ all:	im-gcin.so im-gcin-cur.so
  
 -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.1.0
++im-gcin.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.2.0
+ 	$(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
++im-gcin-cur.so:     $(OBJS) ../im-client/libgcin-im-client.so.1.2.0
  	$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
  	rm -f core.*
  
-diff -urN gcin-1.4.3.orig/im-client/Makefile gcin-1.4.3/im-client/Makefile
---- gcin-1.4.3.orig/im-client/Makefile	2008-08-25 21:27:08.000000000 +0800
-+++ gcin-1.4.3/im-client/Makefile	2009-01-23 09:35:10.000000000 +0800
+diff -urN gcin-1.4.5.orig/im-client/Makefile gcin-1.4.5/im-client/Makefile
+--- gcin-1.4.5.orig/im-client/Makefile	2009-04-16 23:39:50.000000000 +0800
++++ gcin-1.4.5/im-client/Makefile	2009-05-07 14:49:23.000000000 +0800
 @@ -27,9 +27,9 @@
  LOCALLIB=/usr/local/$(LIB)
  


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/F-9/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	4 Feb 2009 07:48:53 -0000	1.22
+++ sources	7 May 2009 07:36:59 -0000	1.23
@@ -1 +1 @@
-917874510ebdb8b28bf6a63251600493  gcin-1.4.4.tar.bz2
+b7e5e40804b2a645ae64f4dedb2b3985  gcin-1.4.5.tar.bz2




More information about the fedora-extras-commits mailing list