rpms/ruby-gnome2/devel ruby-gnome2-all-0.16.0-glib-2.14.patch, NONE, 1.1 ruby-gnome2.spec, 1.5, 1.6

[Allisson Azevedo (allisson)]

Author: allisson

Update of /cvs/pkgs/rpms/ruby-gnome2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28995/devel

Modified Files:
	ruby-gnome2.spec 
Added Files:
	ruby-gnome2-all-0.16.0-glib-2.14.patch 
Log Message:

Add glib-2.14 patch


ruby-gnome2-all-0.16.0-glib-2.14.patch:

--- NEW FILE ruby-gnome2-all-0.16.0-glib-2.14.patch ---
--- ruby-gnome2-all-0.16.0/glib/src/rbglib_maincontext.c.glib2_14	2006-12-29 22:17:28.000000000 +0900
+++ ruby-gnome2-all-0.16.0/glib/src/rbglib_maincontext.c	2007-08-09 23:05:28.000000000 +0900
@@ -343,7 +343,7 @@
     info->callback = func;
     id = g_timeout_add_seconds(NUM2UINT(interval),
                                (GSourceFunc)invoke_source_func,
-                               (gpointer)info, g_free);
+                               (gpointer)info);
     info->id = id;
     rb_id = UINT2NUM(id);
     G_RELATIVE2(mGLibSource, func, id__callbacks__, rb_id);
--- ruby-gnome2-all-0.16.0/glib/src/rbglib_unicode.c.glib2_14	2006-12-29 22:17:28.000000000 +0900
+++ ruby-gnome2-all-0.16.0/glib/src/rbglib_unicode.c	2007-08-09 23:35:54.000000000 +0900
@@ -140,7 +140,7 @@
 rbglib_m_unichar_get_script(VALUE self, VALUE unichar)
 {
     return GENUM2RVAL(g_unichar_get_script(NUM2UINT(unichar)),
-                      G_TYPE_UNICODE_SCRIPT_TYPE);
+                      G_TYPE_UNICODE_SCRIPT);
 }
 #endif
 


Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-gnome2/devel/ruby-gnome2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ruby-gnome2.spec	9 Aug 2007 10:36:56 -0000	1.5
+++ ruby-gnome2.spec	9 Aug 2007 16:46:53 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:           ruby-gnome2
 Version:        0.16.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
 Group:          System Environment/Libraries
@@ -14,6 +14,7 @@
 Patch0:         ruby-gnome2-script.patch
 Patch10:	ruby-gnome2-all-0.16.0-typedef.patch
 Patch11:	ruby-gnome2-all-0.16.0-newpoppler.patch
+Patch12:	ruby-gnome2-all-0.16.0-glib-2.14.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ruby ruby-devel gtk2-devel libgnome-devel libgnomeui-devel
@@ -237,11 +238,16 @@
 
 BuildRequires:  ruby ruby-devel gtk2-devel pango-devel 
 
-%if "%fedora" > "6"
+%if "%fedora" > "7"
 BuildRequires:  firefox-devel = 2.0.0.6
 Requires:       firefox = 2.0.0.6
 %endif
 
+%if "%fedora" == "7"
+BuildRequires:	firefox-devel = 2.0.0.5
+Requires:	firefox = 2.0.0.5
+%endif
+
 %if "%fedora" == "6"
 BuildRequires:  firefox-devel = 1.5.0.12
 Requires:       firefox = 1.5.0.12
@@ -421,6 +427,7 @@
 %patch0 -p1
 %patch10 -p1 -b .typedef
 %patch11 -p1 -b .newpoppler
+%patch12 -p1 -b .glib2_14
 
 #Because of an error in upstream packaging there is a second ruby-gnome2 dir inside so we delete it
 #%{__rm} -rf %{name}
@@ -614,6 +621,8 @@
 
 
 %changelog
+* Thu Aug  9 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> 0.16.0-10
+- Adjust to GLib 2.14 API + typo fix in glib module
 
 * Thu Aug  9 2007 Allisson Azevedo <allisson at gmail.com> 0.16.0-9
 - Rebuild against new firefox