rpms/tomoe/F-10 import.log, 1.1, 1.2 tomoe-0.6.0-multiarch-conflict.patch, 1.1, 1.2 tomoe.spec, 1.24, 1.25

[Ding-Yi Chen]

Author: dchen

Update of /cvs/pkgs/rpms/tomoe/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15997/F-10

Modified Files:
	import.log tomoe-0.6.0-multiarch-conflict.patch tomoe.spec 
Log Message:
[bug 343321] multiarch conflicts in tomoe


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tomoe/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Jan 2009 12:52:07 -0000	1.1
+++ import.log	19 Jan 2009 00:20:38 -0000	1.2
@@ -1 +1,2 @@
 tomoe-0_6_0-9_fc10:F-10:tomoe-0.6.0-9.fc10.src.rpm:1232196692
+tomoe-0_6_0-10_fc10:F-10:tomoe-0.6.0-10.fc10.src.rpm:1232324403

tomoe-0.6.0-multiarch-conflict.patch:

Index: tomoe-0.6.0-multiarch-conflict.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomoe/F-10/tomoe-0.6.0-multiarch-conflict.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomoe-0.6.0-multiarch-conflict.patch	17 Jan 2009 12:52:07 -0000	1.1
+++ tomoe-0.6.0-multiarch-conflict.patch	19 Jan 2009 00:20:39 -0000	1.2
@@ -1,17 +1,18 @@
 diff -up ./doc/reference/tomoe-docs.sgml.multiarch-conflict ./doc/reference/tomoe-docs.sgml
 --- ./doc/reference/tomoe-docs.sgml.multiarch-conflict	2007-04-10 17:24:20.000000000 +1000
-+++ ./doc/reference/tomoe-docs.sgml	2009-01-16 17:54:20.000000000 +1000
-@@ -41,6 +41,7 @@
++++ ./doc/reference/tomoe-docs.sgml	2009-01-19 09:57:04.000000000 +1000
+@@ -40,7 +40,7 @@
+     &tomoe-Writing;
    </chapter>
  
-   <index>
-+    <anchor id="index_page">
+-  <index>
++  <index id="index_page">
      <title>Index</title>
    </index>
  <!--
 diff -up ./lib/tomoe-char.c.multiarch-conflict ./lib/tomoe-char.c
 --- ./lib/tomoe-char.c.multiarch-conflict	2007-06-18 11:35:43.000000000 +1000
-+++ ./lib/tomoe-char.c	2009-01-16 17:53:58.000000000 +1000
++++ ./lib/tomoe-char.c	2009-01-16 17:55:11.000000000 +1000
 @@ -92,7 +92,7 @@ tomoe_char_class_init (TomoeCharClass *k
      spec = g_param_spec_int ("n_strokes",
                               N_("Number of strokes"),
@@ -23,7 +24,7 @@
  
 diff -up ./lib/tomoe-query.c.multiarch-conflict ./lib/tomoe-query.c
 --- ./lib/tomoe-query.c.multiarch-conflict	2007-06-07 17:04:20.000000000 +1000
-+++ ./lib/tomoe-query.c	2009-01-16 17:53:58.000000000 +1000
++++ ./lib/tomoe-query.c	2009-01-16 17:55:11.000000000 +1000
 @@ -95,7 +95,7 @@ tomoe_query_class_init (TomoeQueryClass 
                               N_("Minimum number of strokes"),
                               N_("Minimum number of strokes of searched "


Index: tomoe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomoe/F-10/tomoe.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- tomoe.spec	17 Jan 2009 12:52:07 -0000	1.24
+++ tomoe.spec	19 Jan 2009 00:20:39 -0000	1.25
@@ -3,7 +3,7 @@
 
 Name:           tomoe
 Version:        0.6.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Handwritten input system for Japanese and Chinese
 
 Group:          System Environment/Libraries
@@ -99,7 +99,7 @@
 %endif
 
 %changelog
-* Fri Jan 16 2009 Ding-Yi Chen <dchen at redhat.com> - 0.6.0-9
+* Mon Jan 19 2009 Ding-Yi Chen <dchen at redhat.com> - 0.6.0-10
 - Fix [Bug 343321] multiarch conflicts in tomoe.
   Maybe cause by bug in gtk-doc.
 - Also fix the errors from rpmlint: