rpms/tomoe/F-9 import.log, NONE, 1.1 tomoe-0.6.0-multiarch-conflict.patch, NONE, 1.1 tomoe.spec, 1.22, 1.23

Sat Jan 17 12:54:37 UTC 2009

Author: dchen

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

Modified Files:
	tomoe.spec 
Added Files:
	import.log tomoe-0.6.0-multiarch-conflict.patch 
Log Message:
Bug 343321

--- NEW FILE import.log ---
tomoe-0_6_0-9_fc10:F-9:tomoe-0.6.0-9.fc10.src.rpm:1232196797

tomoe-0.6.0-multiarch-conflict.patch:

--- NEW FILE tomoe-0.6.0-multiarch-conflict.patch ---
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 @@
   </chapter>
 
   <index>
+    <anchor 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
@@ -92,7 +92,7 @@ tomoe_char_class_init (TomoeCharClass *k
     spec = g_param_spec_int ("n_strokes",
                              N_("Number of strokes"),
                              N_("Number of strokes of the character."),
-                             -1, G_MAXINT32, -1,
+                             -2, G_MAXINT32, -1,
                              G_PARAM_READABLE | G_PARAM_WRITABLE);
     g_object_class_install_property (gobject_class, PROP_N_STROKES, spec);
 
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
@@ -95,7 +95,7 @@ tomoe_query_class_init (TomoeQueryClass 
                              N_("Minimum number of strokes"),
                              N_("Minimum number of strokes of searched "
                                 "character."),
-                             -1, G_MAXINT32, -1,
+                             -2, G_MAXINT32, -1,
                              G_PARAM_READWRITE);
     g_object_class_install_property (gobject_class, PROP_MIN_N_STROKES, spec);
 
@@ -103,7 +103,7 @@ tomoe_query_class_init (TomoeQueryClass 
                              N_("Maximum number of strokes"),
                              N_("Maximum number of strokes of searched "
                                 "character."),
-                             -1, G_MAXINT32, -1,
+                             -2, G_MAXINT32, -1,
                              G_PARAM_READWRITE);
     g_object_class_install_property (gobject_class, PROP_MAX_N_STROKES, spec);
 


Index: tomoe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomoe/F-9/tomoe.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- tomoe.spec	27 Feb 2008 09:10:59 -0000	1.22
+++ tomoe.spec	17 Jan 2009 12:54:07 -0000	1.23
@@ -3,16 +3,17 @@
 
 Name:           tomoe
 Version:        0.6.0
-Release:        5%{?dist}
+Release:        9%{?dist}
 Summary:        Handwritten input system for Japanese and Chinese
 
 Group:          System Environment/Libraries
-License:        LGPL2+
+License:        LGPLv2+
 URL:            http://scim-imengine.sourceforge.jp/
 Source0:        http://downloads.sourceforge.net/sourceforge/tomoe/%{name}-%{version}.tar.gz
+Patch0:         tomoe-0.6.0-multiarch-conflict.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  glib2-devel, gettext, gtk-doc
-BuildRequires:  perl(XML::Parser), python, pygtk2-codegen
+BuildRequires:  glib2-devel, gettext, gtk-doc, libtool, intltool
+BuildRequires:  perl(XML::Parser), python
 %if %{python_binding}
 BuildRequires:  pygobject2-devel, python-devel, pygtk2-codegen
 %endif
@@ -27,7 +28,7 @@
 
 
 %package devel
-Summary:    tomoe development files
+Summary:    Tomoe development files
 Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 # for %{_datadir}/gtk-doc/html
@@ -40,9 +41,10 @@
 
 %prep
 %setup -q
-
+%patch0 -p0 -b .multiarch-conflict
 
 %build
+autoreconf -vif
 %configure --disable-static --enable-gtk-doc
 make %{?_smp_mflags}
 
@@ -51,8 +53,9 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 %if !%{ruby_binding}
-rm -f $RPM_BUILD_ROOT%{_prefix}/lib/ruby/site_ruby/*/tomoe.rb $RPM_BUILD_ROOT%{_libdir}/ruby/site_ruby/*/*-linux/*
+rm -f $RPM_BUILD_ROOT%{_libdir}/ruby/site_ruby/*/tomoe.rb $RPM_BUILD_ROOT%{_libdir}/ruby/site_ruby/*/*-linux/*
 %endif
+chmod 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/xml2est.rb
 
 # remove .la files
 find ${RPM_BUILD_ROOT}%{_libdir} -name '*.la' | xargs rm
@@ -75,7 +78,7 @@
 %doc AUTHORS COPYING NEWS README TODO data/kanjidic*.html
 %{_libdir}/libtomoe.so.*
 %if %{python_binding}
-%{_libdir}/python2.5/site-packages/tomoe.so
+%{_libdir}/python?.?/site-packages/tomoe.so
 %endif
 %{_libdir}/tomoe
 %{_datadir}/tomoe
@@ -91,11 +94,27 @@
 %{_datadir}/gtk-doc/html/tomoe
 %{_libdir}/pkgconfig/pytomoe.pc
 %if %{ruby_binding}
-%{_prefix}/lib/ruby/site_ruby/1.8/tomoe.rb
+%{_libdir}/ruby/site_ruby/1.8/tomoe.rb
 %{_libdir}/ruby/site_ruby/1.8/*-linux/*
 %endif
 
 %changelog
+* Fri Jan 16 2009 Ding-Yi Chen <dchen at redhat.com> - 0.6.0-9
+- Fix [Bug 343321] multiarch conflicts in tomoe.
+  Maybe cause by bug in gtk-doc.
+- Also fix the errors from rpmlint:
+  chmod 755 /usr/share/tomoe/xml2est.rb
+  
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.6.0-8
+- Fix locations for Python 2.6
+
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.6.0-7
+- Rebuild for Python 2.6
+
+* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.6.0-6
+- fix license tag
+
 * Wed Feb 27 2008 Jens Petersen <petersen at redhat.com> - 0.6.0-5
 - update license field from LGPL to LGPL2+
 


