--- a/ChangeLog	Fri Nov 03 17:34:26 2006 +0000
+++ b/ChangeLog	Fri Nov 03 21:48:38 2006 +0000
@@ -1,5 +1,8 @@
-2006-11-02  Damien Carbery <[email protected]>
-
+2006-11-03  Damien Carbery <[email protected]>
+
+	* gaim.spec: Specify sysconfdir in configure call as gaim.schemas is 
+	installed there.
+	* patches/gaim-07-gtk-func-def.diff: Rework to match upstream fix.
 	* gcalctool.spec: Bump to 5.8.25. Remove upstream patch, 
 	02-arabic-decimal-point.
 	* patches/gcalctool-02-arabic-decimal-point.diff: Removed, upstream.

--- a/gaim.spec	Fri Nov 03 17:34:26 2006 +0000
+++ b/gaim.spec	Fri Nov 03 21:48:38 2006 +0000
@@ -81,7 +81,12 @@
 
 CFLAGS="$RPM_OPT_FLAGS -DG_IMPLEMENT_INLINES -DG_HAVE_ISO_VARARGS" \
 LD_LIBRARY_PATH="%{_libdir}:$LD_LIBRARY_PATH"
-./configure --prefix=%{_prefix} --mandir=%{_mandir} --disable-binreloc --with-static-prpls=all
+./configure 				\
+	--prefix=%{_prefix} 		\
+	--mandir=%{_mandir}		\
+	--sysconfdir=%{_sysconfdir}	\
+	--disable-binreloc		\
+	--with-static-prpls=all
 
 make -j $CPUS
 
@@ -118,6 +123,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Fri Nov 03 2006 - [email protected]
+- Specify sysconfdir in configure call as gaim.schemas is installed there.
+ 
 * Thu Nov 02 2006 - [email protected]
 - Add patch, 07-gtk-func-def, to fix inconsistency between a function 
   declaration and definition. Submitted upstream via sourceforge.net bug db.

--- a/patches/gaim-07-gtk-func-def.diff	Fri Nov 03 17:34:26 2006 +0000
+++ b/patches/gaim-07-gtk-func-def.diff	Fri Nov 03 21:48:38 2006 +0000
@@ -1,5 +1,5 @@
---- gaim-2.0.0beta4/gtk/gtkcellrendererexpander.c.orig	2006-11-02 21:50:59.005380000 +0000
-+++ gaim-2.0.0beta4/gtk/gtkcellrendererexpander.c	2006-11-02 21:52:25.735525000 +0000
+--- gaim-2.0.0beta4/gtk/gtkcellrendererexpander.c.orig	2006-10-18 18:37:48.000000000 +0100
++++ gaim-2.0.0beta4/gtk/gtkcellrendererexpander.c	2006-11-03 19:10:47.083709000 +0000
 @@ -56,13 +56,13 @@
  						   GdkRectangle               *cell_area,
  						   GdkRectangle               *expose_area,
@@ -15,7 +15,7 @@
 +						      const gchar                *p,
 +						      GdkRectangle               *bg,
 +						      GdkRectangle               *cell,
-+						      GtkCellRendererState                       flags);
++						      GtkCellRendererState        flags);
  static void  gaim_gtk_cell_renderer_expander_finalize (GObject *gobject);
  
  enum {