rpms/gcin/devel gcin.spec,1.35,1.36 im-client.patch,1.11,1.12

Jens Petersen petersen at fedoraproject.org
Mon Sep 29 01:54:26 UTC 2008 

Author: petersen

Update of /cvs/pkgs/rpms/gcin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20122

Modified Files:
	gcin.spec im-client.patch 
Log Message:
update im-client.patch to fix patch fuzz


Index: gcin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcin/devel/gcin.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gcin.spec	27 Jun 2008 08:09:44 -0000	1.35
+++ gcin.spec	29 Sep 2008 01:53:56 -0000	1.36
@@ -1,6 +1,6 @@
 Name:           gcin
 Version:        1.4.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Input method for Traditional Chinese
 
 Group:          System Environment/Libraries
@@ -112,6 +112,9 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Mon Sep 29 2008 Jens Petersen <petersen at redhat.com> - 1.4.2-3
+- update im-client.patch to fix patch fuzz
+
 * Fri Jun 27 2008 Chung-Yen Chang <candyz0416 at gmail.com> - 1.4.2-2
 - update gcin.conf (change gcin to /usr/bin/gcin)
 - add imsettings to Requires

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcin/devel/im-client.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- im-client.patch	30 Jan 2008 14:42:23 -0000	1.11
+++ im-client.patch	29 Sep 2008 01:53:56 -0000	1.12
@@ -1,16 +1,45 @@
-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 @@
+diff -up gcin-1.4.2/gtk-im/Makefile.im-client gcin-1.4.2/gtk-im/Makefile
+--- gcin-1.4.2/gtk-im/Makefile.im-client	2007-03-01 12:04:07.000000000 +1000
++++ gcin-1.4.2/gtk-im/Makefile	2008-09-29 11:46:33.000000000 +1000
+@@ -24,8 +24,7 @@ endif
+ .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 -up gcin-1.4.2/im-client/Makefile.im-client gcin-1.4.2/im-client/Makefile
+--- gcin-1.4.2/im-client/Makefile.im-client	2007-03-01 12:04:36.000000000 +1000
++++ gcin-1.4.2/im-client/Makefile	2008-09-29 11:46:33.000000000 +1000
+@@ -27,9 +27,9 @@ $(SOFILEVER):   $(OBJS)
+ 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 -up gcin-1.4.2/Makefile.im-client gcin-1.4.2/Makefile
+--- gcin-1.4.2/Makefile.im-client	2008-05-31 14:19:16.000000000 +1000
++++ gcin-1.4.2/Makefile	2008-09-29 11:46:33.000000000 +1000
+@@ -8,7 +8,7 @@ gcin_tsin_o = tsin.o tsin-util.o win0.o 
  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_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 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 \
-@@ -18,7 +18,7 @@
+@@ -18,7 +18,7 @@ OBJS_TSLEARN=tslearn.o util.o gcin-conf.
               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
@@ -19,7 +48,7 @@
  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 @@
+@@ -95,8 +95,7 @@ endif
  	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
  
  gcin:   $(OBJS) $(IMdkitLIB) $(im-srv)
@@ -29,7 +58,7 @@
  	rm -f core.*
  	ln -sf $@ $@.test
  
-@@ -107,7 +106,6 @@
+@@ -107,7 +106,6 @@ juyin-learn:        $(OBJS_JUYIN_LEARN)
  	$(CC) -o $@ $(OBJS_JUYIN_LEARN) $(LDFLAGS)
  	rm -f core.*
  sim2trad:        $(OBJS_sim2trad)
@@ -37,7 +66,7 @@
  	$(CC) -o $@ $(OBJS_sim2trad) $(LDFLAGS)
  	rm -f core.*
  trad2sim:	sim2trad
-@@ -161,13 +159,13 @@
+@@ -161,13 +159,13 @@ gcin-message:	$(OBJS_gcin_message)
  pin-juyin:	$(OBJS_pin_juyin)
  	$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
  
@@ -58,7 +87,7 @@
  
  ### making the following as .so actuall makes the RSS larger
  gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
-@@ -192,14 +190,11 @@
+@@ -192,14 +190,11 @@ $(im-srv):
  ibin:
  	install $(PROGS) $(bindir); \
  	rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
@@ -73,7 +102,7 @@
  	install -d $(bindir)
  	$(MAKE) -C data install
  	$(MAKE) -C im-client install
-@@ -207,13 +202,9 @@
+@@ -207,13 +202,9 @@ install:
  	if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im install; fi
  	if [ $(prefix) = /usr/local ]; then \
  	   install -m 644 gcin.png /usr/share/icons; \
@@ -87,7 +116,7 @@
  	   install -s $(PROGS) $(bindir); \
  	   rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \
  	fi
-@@ -233,7 +224,7 @@
+@@ -233,7 +224,7 @@ clean:
  	$(MAKE) -C qt-im clean
  	$(MAKE) -C man clean
  	$(MAKE) -C menu clean
@@ -96,32 +125,3 @@
  	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)

More information about the fedora-extras-commits mailing list