- rel 4

- fixed build with glib 2.32+

Changed files:
    tomoe-glib2.32.patch -> 1.1
    tomoe.spec -> 1.4

diff --git a/tomoe-glib2.32.patch b/tomoe-glib2.32.patch
new file mode 100644 (file)
index 0000000..bd14c13
--- /dev/null
+++ b/tomoe-glib2.32.patch
@@ -0,0 +1,22 @@
+--- tomoe-0.6.0/lib/glib-utils.h~      2007-04-25 09:35:58.000000000 +0200
++++ tomoe-0.6.0/lib/glib-utils.h       2012-04-18 19:56:43.196658521 +0200
+@@ -28,7 +28,7 @@
+ #include "config.h"
+ #endif /* HAVE_CONFIG_H */
+ 
+-#include <glib/garray.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include "glib-compat-file-utilities.h"
+ #include "glib-compat-key-file.h"
+--- tomoe-0.6.0/lib/tomoe.c~   2007-06-06 09:35:53.000000000 +0200
++++ tomoe-0.6.0/lib/tomoe.c    2012-04-18 19:58:11.336657883 +0200
+@@ -26,7 +26,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <glib/garray.h>
++#include <glib.h>
+ #include "tomoe.h"
+ 
+ static gboolean initialized = FALSE;

diff --git a/tomoe.spec b/tomoe.spec
index 4a9885f4bcba122aa742fe89740745f76169aa65..364a214cf6e663eeb849a3c0352e208e039d55a6 100644 (file)
--- a/tomoe.spec
+++ b/tomoe.spec
@@ -7,7 +7,7 @@
 Summary:       Handwritten input system for Japanese and Chinese
 Name:          tomoe
 Version:       0.6.0
-Release:       3
+Release:       4
 License:       LGPL v2+
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/tomoe/%{name}-%{version}.tar.gz
@@ -15,6 +15,7 @@ Source0:      http://downloads.sourceforge.net/tomoe/%{name}-%{version}.tar.gz
 Patch0:                %{name}-multiarch-conflict.patch
 Patch1:                %{name}-bz502662.patch
 Patch2:                %{name}-svn-libs.patch
+Patch3:                %{name}-glib2.32.patch
 URL:           http://tomoe.sourceforge.jp/
 BuildRequires: gettext
 BuildRequires: glib2-devel
@@ -104,6 +105,7 @@ Tomoe bindings for ruby.
 %patch0 -p0
 %patch1 -p0
 %patch2 -p1
+%patch3 -p1
 
 %{__sed} 's|#!/usr/bin/env ruby|#!/usr/bin/ruby|' data/xml2est.rb