--- a/ChangeLog	Wed Jan 18 20:43:58 2006 +0000
+++ b/ChangeLog	Wed Jan 18 21:00:01 2006 +0000
@@ -1,3 +1,12 @@
+2006-01-18  Damien Carbery <[email protected]>
+
+	* gaim.spec: Bump to 2.0.0beta1, remove obsolete patches 
+	(08-sound_errors and 11-g11n-enable-im). Add patches 08-libgaimperl 
+	and 11-forte.
+	* patches/gaim-08-libgaimperl.diff, patches/gaim-11-forte.diff: Added 
+	* patches/gaim-08-sound_errors.diff, patches/gaim-11-g11n-enable-im.diff
+	Deleted, obsolete (patched code no longer in module).
+
 2006-01-18  Damien Carbery <[email protected]>
 
 	* nautilus.spec, gnome-screensaver.spec, gnome-panel.spec, eog.spec,

--- a/gaim.spec	Wed Jan 18 20:43:58 2006 +0000
+++ b/gaim.spec	Wed Jan 18 21:00:01 2006 +0000
@@ -6,8 +6,8 @@
 # package are under the same license as the package itself.
 #
 Name:		gaim
-Version:	1.5.0
-Release:        201
+Version:	2.0.0beta1
+Release:        1
 License:	GPL
 Group:		Applications/Internet
 Distribution:	Java Desktop System
@@ -21,10 +21,10 @@
 Patch5:         gaim-05-po-mkinstalldirs.diff
 Patch6:         gaim-06-gettext.diff
 Patch7:         gaim-07-void-return.diff
-Patch8:         gaim-08-sound_errors.diff
+Patch8:         gaim-08-libgaimperl.diff
 Patch9:         gaim-09-add-help.diff
 Patch10:        gaim-10-long-preferences.diff
-Patch11:        gaim-11-g11n-enable-im.diff
+Patch11:        gaim-11-forte.diff
 
 URL:		http://gaim.sourceforge.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-build
@@ -124,6 +124,10 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jan 18 2006 - [email protected]
+- Bump to 2.0.0beta1, remove obsolete patches (08-sound_errors and 
+  11-g11n-enable-im). Add patches 08-libgaimperl and 11-forte.
+
 * Tue Nov 29 2005 - laca.com
 - remove javahelp stuff
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gaim-08-libgaimperl.diff	Wed Jan 18 21:00:01 2006 +0000
@@ -0,0 +1,12 @@
+--- gaim-2.0.0beta1/plugins/perl/libgaimperl.c.orig	2006-01-18 19:36:01.033389000 +0000
++++ gaim-2.0.0beta1/plugins/perl/libgaimperl.c	2006-01-18 19:37:37.995810000 +0000
+@@ -1,7 +1,7 @@
+ #include <gmodule.h>
+-void __attribute__ ((constructor)) my_init(void);
++void my_init(void);
+ 
+-void __attribute__ ((constructor)) my_init() {
++void my_init() {
+ 	/* Very evil hack...puts perl.so's symbols in the global table
+ 	 * but does not create a circular dependancy because g_module_open
+ 	 * will only open the library once. */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gaim-11-forte.diff	Wed Jan 18 21:00:01 2006 +0000
@@ -0,0 +1,39 @@
+--- gaim-2.0.0beta1/src/stun.c.orig	2006-01-18 19:51:18.199503000 +0000
++++ gaim-2.0.0beta1/src/stun.c	2006-01-18 19:52:57.091081000 +0000
+@@ -39,6 +39,7 @@
+ #include "proxy.h"
+ #include "stun.h"
+ #include "prefs.h"
++#include <sys/sockio.h>
+ 
+ static struct stun_nattype nattype = {-1, 0, "\0"};
+ 
+--- gaim-2.0.0beta1/src/gtkconv.c.orig	2006-01-18 20:05:20.978907000 +0000
++++ gaim-2.0.0beta1/src/gtkconv.c	2006-01-18 20:05:47.496150000 +0000
+@@ -4814,7 +4814,7 @@
+ 	if (smiley->icon)
+ 		g_object_ref(G_OBJECT(smiley->icon));
+ #ifdef DEBUG_CUSTOM_SMILEY	
+-	gaim_debug_info("custom-smiley", "%s(): got GdkPixbufAnimation %p for smiley '%s'\n", __FUNCTION__, smiley->icon, smiley->smile);
++	gaim_debug_info("custom-smiley", "%s(): got GdkPixbufAnimation %p for smiley '%s'\n", __func__, smiley->icon, smiley->smile);
+ #endif
+ }
+ 
+@@ -4828,7 +4828,7 @@
+ 	smiley = (GtkIMHtmlSmiley *)user_data;
+ 	if (!smiley->imhtml) {
+ #ifdef DEBUG_CUSTOM_SMILEY
+-		gaim_debug_error("custom-smiley", "%s(): orphan smiley found: %p\n", __FUNCTION__, smiley);
++		gaim_debug_error("custom-smiley", "%s(): orphan smiley found: %p\n", __func__, smiley);
+ #endif
+ 		g_object_unref(G_OBJECT(loader));
+ 		smiley->loader = NULL;
+@@ -4841,7 +4841,7 @@
+ 
+ #ifdef DEBUG_CUSTOM_SMILEY		
+ 		gaim_debug_info("custom-smiley", "%s(): got GtkImage %p from GtkPixbufAnimation %p for smiley '%s'\n", 
+-				__FUNCTION__, icon, smiley->icon, smiley->smile);
++				__func__, icon, smiley->icon, smiley->smile);
+ #endif
+ 		if (icon) {
+ 			gtk_widget_show(icon);