packages: tomoe/tomoe-bz502662.patch (NEW), tomoe/tomoe-multiarch-conflict....
baggins
baggins at pld-linux.org
Thu Jul 21 15:01:50 CEST 2011
Author: baggins Date: Thu Jul 21 13:01:50 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- initial revision
---- Files affected:
packages/tomoe:
tomoe-bz502662.patch (NONE -> 1.1) (NEW), tomoe-multiarch-conflict.patch (NONE -> 1.1) (NEW), tomoe-svn-libs.patch (NONE -> 1.1) (NEW), tomoe.spec (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/tomoe/tomoe-bz502662.patch
diff -u /dev/null packages/tomoe/tomoe-bz502662.patch:1.1
--- /dev/null Thu Jul 21 15:01:50 2011
+++ packages/tomoe/tomoe-bz502662.patch Thu Jul 21 15:01:45 2011
@@ -0,0 +1,124 @@
+diff -up ./lib/tomoe-dict-ptr-array.c.bz502662 ./lib/tomoe-dict-ptr-array.c
+--- ./lib/tomoe-dict-ptr-array.c.bz502662 2007-06-21 11:48:57.000000000 +1000
++++ ./lib/tomoe-dict-ptr-array.c 2009-06-02 13:23:40.000000000 +1000
+@@ -50,7 +50,7 @@ struct _TomoeDictPtrArrayPrivate
+
+ static TomoeDictClass *parent_class;
+
+-G_DEFINE_ABSTRACT_TYPE (TomoeDictPtrArray, _tomoe_dict_ptr_array, TOMOE_TYPE_DICT)
++G_DEFINE_ABSTRACT_TYPE (TomoeDictPtrArray, tomoe_dict_ptr_array, TOMOE_TYPE_DICT)
+
+ static void dispose (GObject *object);
+ static void set_property (GObject *object,
+@@ -75,7 +75,7 @@ static gboolean is_editable
+ static gchar *get_available_private_utf8 (TomoeDict *dict);
+
+ static void
+-_tomoe_dict_ptr_array_class_init (TomoeDictPtrArrayClass *klass)
++tomoe_dict_ptr_array_class_init (TomoeDictPtrArrayClass *klass)
+ {
+ GObjectClass *gobject_class;
+ TomoeDictClass *dict_class;
+@@ -123,7 +123,7 @@ _tomoe_dict_ptr_array_class_init (TomoeD
+ }
+
+ static void
+-_tomoe_dict_ptr_array_init (TomoeDictPtrArray *dict)
++tomoe_dict_ptr_array_init (TomoeDictPtrArray *dict)
+ {
+ TomoeDictPtrArrayPrivate *priv = TOMOE_DICT_PTR_ARRAY_GET_PRIVATE (dict);
+ priv->chars = g_ptr_array_new();
+@@ -196,7 +196,7 @@ char_compare_func (gconstpointer a, gcon
+ }
+
+ void
+-_tomoe_dict_ptr_array_sort (TomoeDictPtrArray *dict)
++tomoe_dict_ptr_array_sort (TomoeDictPtrArray *dict)
+ {
+ TomoeDictPtrArrayPrivate *priv;
+
+@@ -219,7 +219,7 @@ register_char (TomoeDict *dict, TomoeCha
+
+ unregister_char (dict, tomoe_char_get_utf8 (chr));
+ g_ptr_array_add (priv->chars, g_object_ref (G_OBJECT (chr)));
+- _tomoe_dict_ptr_array_sort (TOMOE_DICT_PTR_ARRAY (dict));
++ tomoe_dict_ptr_array_sort (TOMOE_DICT_PTR_ARRAY (dict));
+
+ priv->modified = TRUE;
+
+@@ -523,7 +523,7 @@ get_available_private_utf8 (TomoeDict *d
+ }
+
+ GPtrArray *
+-_tomoe_dict_ptr_array_get_array (TomoeDictPtrArray *dict)
++tomoe_dict_ptr_array_get_array (TomoeDictPtrArray *dict)
+ {
+ g_return_val_if_fail (TOMOE_IS_DICT_PTR_ARRAY (dict), NULL);
+
+diff -up ./lib/tomoe-dict-ptr-array.h.bz502662 ./lib/tomoe-dict-ptr-array.h
+--- ./lib/tomoe-dict-ptr-array.h.bz502662 2007-06-21 11:48:57.000000000 +1000
++++ ./lib/tomoe-dict-ptr-array.h 2009-06-02 13:27:12.000000000 +1000
+@@ -29,7 +29,7 @@ G_BEGIN_DECLS
+
+ #include "tomoe-dict.h"
+
+-#define TOMOE_TYPE_DICT_PTR_ARRAY (_tomoe_dict_ptr_array_get_type ())
++#define TOMOE_TYPE_DICT_PTR_ARRAY (tomoe_dict_ptr_array_get_type ())
+ #define TOMOE_DICT_PTR_ARRAY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TOMOE_TYPE_DICT_PTR_ARRAY, TomoeDictPtrArray))
+ #define TOMOE_DICT_PTR_ARRAY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TOMOE_TYPE_DICT_PTR_ARRAY, TomoeDictPtrArrayClass))
+ #define TOMOE_IS_DICT_PTR_ARRAY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TOMOE_TYPE_DICT_PTR_ARRAY))
+@@ -49,9 +49,11 @@ struct _TomoeDictPtrArrayClass
+ TomoeDictClass parent_class;
+ };
+
+-GType _tomoe_dict_ptr_array_get_type (void) G_GNUC_CONST;
+-void _tomoe_dict_ptr_array_sort (TomoeDictPtrArray *dict);
+-GPtrArray *_tomoe_dict_ptr_array_get_array (TomoeDictPtrArray *dict);
++GType tomoe_dict_ptr_array_get_type (void) G_GNUC_CONST;
++void tomoe_dict_ptr_array_sort (TomoeDictPtrArray *dict);
++#define _tomoe_dict_ptr_array_sort tomoe_dict_ptr_array_sort
++GPtrArray *tomoe_dict_ptr_array_get_array (TomoeDictPtrArray *dict);
++#define _tomoe_dict_ptr_array_get_array tomoe_dict_ptr_array_get_array
+
+ G_END_DECLS
+
+diff -up ./lib/tomoe-xml-parser.c.bz502662 ./lib/tomoe-xml-parser.c
+--- ./lib/tomoe-xml-parser.c.bz502662 2007-04-10 17:24:21.000000000 +1000
++++ ./lib/tomoe-xml-parser.c 2009-06-02 13:23:40.000000000 +1000
+@@ -428,7 +428,7 @@ init_parse_data (ParseData *data, TomoeX
+ }
+
+ gboolean
+-_tomoe_xml_parser_parse_dictionary_file (const gchar *filename,
++tomoe_xml_parser_parse_dictionary_file (const gchar *filename,
+ TomoeXMLParsedData *result)
+ {
+ GMarkupParseContext *context;
+@@ -469,7 +469,7 @@ _tomoe_xml_parser_parse_dictionary_file
+ }
+
+ TomoeChar *
+-_tomoe_xml_parser_parse_char_data (const gchar *xml, gssize len)
++tomoe_xml_parser_parse_char_data (const gchar *xml, gssize len)
+ {
+ GMarkupParseContext *context;
+ TomoeXMLParsedData result;
+diff -up ./lib/tomoe-xml-parser.h.bz502662 ./lib/tomoe-xml-parser.h
+--- ./lib/tomoe-xml-parser.h.bz502662 2007-04-10 17:24:21.000000000 +1000
++++ ./lib/tomoe-xml-parser.h 2009-06-02 13:23:40.000000000 +1000
+@@ -37,11 +37,12 @@ struct _TomoeXMLParsedData
+ GPtrArray *chars;
+ };
+
+-gboolean _tomoe_xml_parser_parse_dictionary_file (const gchar *filename,
++gboolean tomoe_xml_parser_parse_dictionary_file (const gchar *filename,
+ TomoeXMLParsedData *result);
+-TomoeChar *_tomoe_xml_parser_parse_char_data (const gchar *xml,
++#define _tomoe_xml_parser_parse_dictionary_file tomoe_xml_parser_parse_dictionary_file
++TomoeChar *tomoe_xml_parser_parse_char_data (const gchar *xml,
+ gssize len);
+-
++#define _tomoe_xml_parser_parse_char_data tomoe_xml_parser_parse_char_data
+
+ G_END_DECLS
+
================================================================
Index: packages/tomoe/tomoe-multiarch-conflict.patch
diff -u /dev/null packages/tomoe/tomoe-multiarch-conflict.patch:1.1
--- /dev/null Thu Jul 21 15:01:50 2011
+++ packages/tomoe/tomoe-multiarch-conflict.patch Thu Jul 21 15:01:45 2011
@@ -0,0 +1,45 @@
+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-19 09:57:04.000000000 +1000
+@@ -40,7 +40,7 @@
+ &tomoe-Writing;
+ </chapter>
+
+- <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: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"),
+ 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: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 "
+ "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: packages/tomoe/tomoe-svn-libs.patch
diff -u /dev/null packages/tomoe/tomoe-svn-libs.patch:1.1
--- /dev/null Thu Jul 21 15:01:50 2011
+++ packages/tomoe/tomoe-svn-libs.patch Thu Jul 21 15:01:45 2011
@@ -0,0 +1,16 @@
+--- tomoe-0.6.0/macros/svn.m4~ 2007-05-07 06:06:54.000000000 +0200
++++ tomoe-0.6.0/macros/svn.m4 2011-07-21 14:46:32.128541432 +0200
+@@ -26,10 +26,12 @@
+ [Use the given path to the subversion libraries.]),
+ [if test "$withval" != "yes" -a "$withval" != ""; then
+ SVN_LIBS=$withval
++ else
++ SVN_LIBS=$svn_libs
+ fi])
+ AC_MSG_CHECKING([for Subversion libraries])
+ svn_lib=""
+-for value in $svn_libs ; do
++for value in $SVN_LIBS ; do
+ if ls $value/libsvn_client-1.* >/dev/null 2>&1; then
+ svn_lib=$value
+ break
================================================================
Index: packages/tomoe/tomoe.spec
diff -u /dev/null packages/tomoe/tomoe.spec:1.1
--- /dev/null Thu Jul 21 15:01:50 2011
+++ packages/tomoe/tomoe.spec Thu Jul 21 15:01:45 2011
@@ -0,0 +1,212 @@
+# $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without python # build without python bindings
+%bcond_with ruby # build with ruby bindings
+%bcond_without static_libs # don't build static libraries
+#
+Summary: Handwritten input system for Japanese and Chinese
+Name: tomoe
+Version: 0.6.0
+Release: 1
+License: LGPL v2+
+Group: Libraries
+Source0: http://downloads.sourceforge.net/tomoe/%{name}-%{version}.tar.gz
+# Source0-md5: 0e51e88d097085e101bf722fc04808ed
+Patch0: %{name}-multiarch-conflict.patch
+Patch1: %{name}-bz502662.patch
+Patch2: %{name}-svn-libs.patch
+URL: http://tomoe.sourceforge.jp/
+BuildRequires: gettext
+BuildRequires: glib2-devel
+BuildRequires: gtk-doc
+BuildRequires: intltool
+BuildRequires: libtool
+BuildRequires: perl(XML::Parser)
+BuildRequires: python
+%if %{with python}
+BuildRequires: python-devel
+BuildRequires: python-pygobject-devel
+BuildRequires: python-pygtk-devel
+%endif
+%if %{with ruby}
+BuildRequires: ruby-gnome2-devel
+%endif
+BuildRequires: apr-util-devel
+BuildRequires: hyperestraier-devel
+BuildRequires: mysql-devel
+BuildRequires: pakchois-devel
+BuildRequires: subversion-devel
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+A program which does Japanese handwriting recognition.
+
+%package devel
+Summary: Tomoe development files
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+The tomoe-devel package includes the header files for the tomoe
+package. Install this package if you want to develop programs which
+use tomoe.
+
+%package static
+Summary: Tomoe static library
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description static
+Tomoe static library.
+
+%package hyperestraier
+Summary: Hyper Estraier dictionary support for tomoe
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description hyperestraier
+Hyper Estraier dictionary support for tomoe.
+
+%package mysql
+Summary: Mysql dictionary support for tomoe
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description mysql
+Mysql dictionary support for tomoe.
+
+%package svn
+Summary: Subversion dictionary support for tomoe
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description svn
+Subversion dictionary support for tomoe.
+
+%package -n python-tomoe
+Summary: Tomoe bindings for python
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description -n python-tomoe
+Tomoe bindings for python.
+
+%package -n ruby-tomoe
+Summary: Tomoe bindings for ruby
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description -n ruby-tomoe
+Tomoe bindings for ruby.
+
+%prep
+%setup -q
+%patch0 -p0
+%patch1 -p0
+%patch2 -p1
+
+%{__sed} 's|#!/usr/bin/env ruby|#!/usr/bin/ruby|' data/xml2est.rb
+
+%build
+%{__libtoolize}
+%{__aclocal} -I macros
+%{__autoconf}
+%{__automake}
+export CFLAGS="%{rpmcflags} -I/usr/include/apr-util"
+%configure \
+ %{!?with_static_libs:--disable-static} \
+ --with-svn-lib=%{_libdir} \
+ --enable-gtk-doc \
+ --with-html-dir=%{_gtkdocdir}
+
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/tomoe/module/{dict,recognizer}/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/tomoe.{a,la}
+
+%find_lang %{name}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files -f %{name}.lang
+%defattr(644,root,root,755)
+%doc AUTHORS NEWS README TODO data/kanjidic*.html
+%dir %{_sysconfdir}/tomoe
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/tomoe/config
+%attr(755,root,root) %{_libdir}/libtomoe.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libtomoe.so.[0-9]
+%dir %{_libdir}/tomoe
+%dir %{_libdir}/tomoe/module
+%dir %{_libdir}/tomoe/module/dict
+%attr(755,root,root) %{_libdir}/tomoe/module/dict/unihan.so
+%attr(755,root,root) %{_libdir}/tomoe/module/dict/xml.so
+%dir %{_libdir}/tomoe/module/recognizer
+%attr(755,root,root) %{_libdir}/tomoe/module/recognizer/simple.so
+%dir %{_datadir}/tomoe
+%dir %{_datadir}/tomoe/dict
+%dir %{_datadir}/tomoe/recognizer
+%{_datadir}/tomoe/recognizer/*.xml
+%{_datadir}/tomoe/dict.dtd
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libtomoe.so
+%{_includedir}/tomoe
+%{_pkgconfigdir}/tomoe.pc
+%{_gtkdocdir}/tomoe
+
+%if %{with static_libs}
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libtomoe.a
+%endif
+
+%files hyperestraier
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/tomoe/module/dict/est.so
+
+%files mysql
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/tomoe/module/dict/mysql.so
+
+%files svn
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/tomoe/module/dict/svn.so
+
+%if %{with ruby}
+%files -n ruby-tomoe
+%defattr(644,root,root,755)
+%{ruby_archdir}
+%{_libdir}/ruby/site_ruby/1.8/tomoe.rb
+%{_libdir}/ruby/site_ruby/1.8/*-linux/*
+%attr(755,root,root) %{_datadir}/tomoe/xml2est.rb
+%endif
+
+%if %{with python}
+%files -n python-tomoe
+%defattr(644,root,root,755)
+%{_pkgconfigdir}/pytomoe.pc
+%attr(755,root,root) %{py_sitedir}/tomoe.so
+%{_datadir}/tomoe/python
+%endif
+
+%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
+%changelog
+* %{date} PLD Team <feedback at pld-linux.org>
+All persons listed below can be reached at <cvs_login>@pld-linux.org
+
+$Log$
+Revision 1.1 2011/07/21 13:01:45 baggins
+- initial revision
+
================================================================
More information about the pld-cvs-commit
mailing list