--- a/ChangeLog	Wed Mar 10 14:24:36 2004 +0000
+++ b/ChangeLog	Wed Mar 10 15:30:41 2004 +0000
@@ -1,3 +1,9 @@
+2004-03-10  Niall Power  <[email protected]>
+
+	* glib.spec: bump to 2.3.6 and remove unused patch.
+	* patches/glib-02-gmessages_va_arg.diff: Removed. It
+	  wasn't being applied and nor should it be.
+
 2004-03-10  Niall Power  <[email protected]>
 
 	* eel.spec: bump to version 2.5.90, update dependency pkg versions

--- a/glib2.spec	Wed Mar 10 14:24:36 2004 +0000
+++ b/glib2.spec	Wed Mar 10 15:30:41 2004 +0000
@@ -1,8 +1,8 @@
 Name:         glib2 
 License:      LGPL
 Group:        System/Libraries
-Version:      2.3.2
-Release:      7
+Version:      2.3.6
+Release:      0
 Distribution: Cinnabar
 Vendor:       Sun Microsystems, Inc.
 Summary:      Low level core compatibility library for GTK+ and GNOME
@@ -17,7 +17,6 @@
 Source8:      libgobject-2.0.3.gz
 Source9:      libgthread-2.0.3.gz
 Patch1:       glib-01-gettext-macro.diff
-Patch2:       glib-02-gmessages_va_arg.diff
 URL:          http://www.gtk.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:	      %{_defaultdocdir}/doc
@@ -104,6 +103,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Mar 10 2004 - <niall,[email protected]>
+- remove glib-02 patch (it wasn't being applied anyway).
+- bump to 2.3.6
+
 * Thu Feb 19 2004 - <[email protected]>
 - Add patch for glib/gmessages.h to change '...' to '__VA_ARGS__' to build
   on Solaris. May revisit to use '#ifdef __sun'

--- a/patches/glib-02-gmessages_va_arg.diff	Wed Mar 10 14:24:36 2004 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
---- glib-2.3.2/glib/gmessages.h.orig	Thu Feb 19 16:18:21 2004
-+++ glib-2.3.2/glib/gmessages.h	Thu Feb 19 16:19:13 2004
-@@ -111,16 +111,16 @@
- #define G_LOG_DOMAIN    ((gchar*) 0)
- #endif  /* G_LOG_DOMAIN */
- #ifdef G_HAVE_ISO_VARARGS
--#define g_error(...)    g_log (G_LOG_DOMAIN,         \
-+#define g_error(__VA_ARGS__)    g_log (G_LOG_DOMAIN,         \
-                                G_LOG_LEVEL_ERROR,    \
-                                __VA_ARGS__)
--#define g_message(...)  g_log (G_LOG_DOMAIN,         \
-+#define g_message(__VA_ARGS__)  g_log (G_LOG_DOMAIN,         \
-                                G_LOG_LEVEL_MESSAGE,  \
-                                __VA_ARGS__)
--#define g_critical(...) g_log (G_LOG_DOMAIN,         \
-+#define g_critical(__VA_ARGS__) g_log (G_LOG_DOMAIN,         \
-                                G_LOG_LEVEL_CRITICAL, \
-                                __VA_ARGS__)
--#define g_warning(...)  g_log (G_LOG_DOMAIN,         \
-+#define g_warning(__VA_ARGS__)  g_log (G_LOG_DOMAIN,         \
-                                G_LOG_LEVEL_WARNING,  \
-                                __VA_ARGS__)
- #elif defined(G_HAVE_GNUC_VARARGS)