[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/gaim/devel gaim-2.0.0beta1-gaim2.patch, NONE, 1.1 gaim2-PIE.patch, NONE, 1.1 .cvsignore, 1.33, 1.34 gaim.spec, 1.120, 1.121 sources, 1.33, 1.34 gaim-0.76-xinput.patch, 1.1, NONE gaim-1.0.1-naive-gnome-check.patch, 1.1, NONE gaim-1.3.1-PIE.patch, 1.1, NONE gaim-1.5.0-aim-rate-limiting.patch, 1.1, NONE gaim-1.5.0-authors.patch, 1.1, NONE gaim-1.5.0-clipboard-leak-history-scroll.patch, 1.1, NONE gaim-1.5.0-copyright.patch, 1.1, NONE gaim-1.5.0-crash-non-terminated-strings.patch, 1.1, NONE gaim-1.5.0-doc-creation.patch, 1.1, NONE gaim-1.5.0-forceful-connection_disconnect-not-wipe-password.patch, 1.1, NONE gaim-1.5.0-hacking-doc.patch, 1.1, NONE gaim-1.5.0-it-yahoo_profile.patch, 1.1, NONE gaim-1.5.0-italics-ircs.patch, 1.1, NONE gaim-1.5.0-logging-compatibility.patch, 1.1, NONE gaim-1.5.0-msn-block-crash.patch, 1.1, NONE gaim-1.5.0-msn-data-corruption-fix.patch, 1.1, NONE gaim-1.5.0-msn-kill-convo-close-timeout-notices-p1.patch, 1.1, NONE gaim-1.5.0-msn-kill-convo-close-timeout-notices-p2.patch, 1.1, NONE gaim! -1.5.0-msn-kill-convo-close-timeout-notices-p3.patch, 1.1, NONE gaim-1.5.0-nss-detect.patch, 1.1, NONE gaim-1.5.0-silc-CID-71.patch, 1.1, NONE gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p1.patch, 1.1, NONE gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p2.patch, 1.1, NONE gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p3.patch, 1.1, NONE gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p4.patch, 1.1, NONE gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p5.patch, 1.1, NONE gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p6.patch, 1.1, NONE gaim-1.5.0-smileys-logtype-p1.patch, 1.1, NONE gaim-1.5.0-smileys-logtype-p2.patch, 1.1, NONE gaim-1.5.0-strip-html-status.patch, 1.1, NONE gaim-1.5.0-xmlnode-cleanup.patch, 1.1, NONE gaim-1.5.0-yahoo-chatroom-ignore-on-join.patch, 1.1, NONE



Author: wtogami

Update of /cvs/dist/rpms/gaim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2110/devel

Modified Files:
	.cvsignore gaim.spec sources 
Added Files:
	gaim-2.0.0beta1-gaim2.patch gaim2-PIE.patch 
Removed Files:
	gaim-0.76-xinput.patch gaim-1.0.1-naive-gnome-check.patch 
	gaim-1.3.1-PIE.patch gaim-1.5.0-aim-rate-limiting.patch 
	gaim-1.5.0-authors.patch 
	gaim-1.5.0-clipboard-leak-history-scroll.patch 
	gaim-1.5.0-copyright.patch 
	gaim-1.5.0-crash-non-terminated-strings.patch 
	gaim-1.5.0-doc-creation.patch 
	gaim-1.5.0-forceful-connection_disconnect-not-wipe-password.patch 
	gaim-1.5.0-hacking-doc.patch gaim-1.5.0-it-yahoo_profile.patch 
	gaim-1.5.0-italics-ircs.patch 
	gaim-1.5.0-logging-compatibility.patch 
	gaim-1.5.0-msn-block-crash.patch 
	gaim-1.5.0-msn-data-corruption-fix.patch 
	gaim-1.5.0-msn-kill-convo-close-timeout-notices-p1.patch 
	gaim-1.5.0-msn-kill-convo-close-timeout-notices-p2.patch 
	gaim-1.5.0-msn-kill-convo-close-timeout-notices-p3.patch 
	gaim-1.5.0-nss-detect.patch gaim-1.5.0-silc-CID-71.patch 
	gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p1.patch 
	gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p2.patch 
	gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p3.patch 
	gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p4.patch 
	gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p5.patch 
	gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p6.patch 
	gaim-1.5.0-smileys-logtype-p1.patch 
	gaim-1.5.0-smileys-logtype-p2.patch 
	gaim-1.5.0-strip-html-status.patch 
	gaim-1.5.0-xmlnode-cleanup.patch 
	gaim-1.5.0-yahoo-chatroom-ignore-on-join.patch 
Log Message:
auto-import gaim-2.0.0-0.3.beta3 on branch devel from gaim-2.0.0-0.3.beta3.src.rpm

gaim-2.0.0beta1-gaim2.patch:
 Makefile.am                             |    8 +++---
 Makefile.in                             |   18 +++++++--------
 configure                               |    6 ++---
 gaim.desktop                            |    4 +--
 m4macros/Makefile.in                    |    2 -
 pixmaps/Makefile.am                     |    4 +--
 pixmaps/Makefile.in                     |    4 +--
 plugins/musicmessaging/musicmessaging.c |    2 -
 po/Makefile.in.in                       |    2 -
 sounds/Makefile.in                      |    2 -
 src/Makefile.am                         |   10 ++++----
 src/Makefile.in                         |   16 ++++++-------
 src/gtkblist.c                          |   12 +++++-----
 src/gtkconv.c                           |    4 +--
 src/gtkdnd-hints.c                      |    2 -
 src/gtklog.c                            |    2 -
 src/gtkmain.c                           |    2 -
 src/gtksound.c                          |    2 -
 src/gtkstock.c                          |   38 ++++++++++++++++----------------
 src/gtkthemes.c                         |    2 -
 src/gtkutils.c                          |    8 +++---
 src/prefs.c                             |    2 -
 22 files changed, 76 insertions(+), 76 deletions(-)

--- NEW FILE gaim-2.0.0beta1-gaim2.patch ---
--- gaim-2.0.0beta1/Makefile.in.gaim2	2006-01-17 16:16:30.000000000 -0600
+++ gaim-2.0.0beta1/Makefile.in	2006-01-17 16:17:32.000000000 -0600
@@ -393,10 +393,10 @@
 EXTRA_DIST = \
 		COPYRIGHT \
 		Doxyfile.in \
-		gaim.pc.in \
+		gaim2.pc.in \
 		gaim.spec.in \
 		gaim.apspec.in \
-		gaim.desktop \
+		gaim2.desktop \
 		gaim-installer.nsi \
 		HACKING \
 		PROGRAMMING_NOTES \
@@ -415,13 +415,13 @@
 		plugins/win32/winprefs/winprefs.c \
 		po/Makefile.mingw
 
-gaimincludedir = $(includedir)/gaim
+gaimincludedir = $(includedir)/gaim2
 gaiminclude_HEADERS = config.h
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gaim.pc
+pkgconfig_DATA = gaim2.pc
 #	cp plugins/perl/common/Gaim.pm $(distdir)/plugins/perl/common
 appsdir = $(datadir)/applications
-apps_DATA = gaim.desktop
+apps_DATA = gaim2.desktop
 SUBDIRS = doc intl m4macros pixmaps plugins po sounds src
 
 # perl's MakeMaker uninstall foo doesn't work well with DESTDIR set, which
@@ -492,7 +492,7 @@
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 plugins/perl/common/Makefile.PL: $(top_builddir)/config.status $(top_srcdir)/plugins/perl/common/Makefile.PL.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-gaim.pc: $(top_builddir)/config.status $(srcdir)/gaim.pc.in
+gaim2.pc: $(top_builddir)/config.status $(srcdir)/gaim.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 gaim.spec: $(top_builddir)/config.status $(srcdir)/gaim.spec.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
--- gaim-2.0.0beta1/src/Makefile.in.gaim2	2006-01-17 16:29:01.000000000 -0600
+++ gaim-2.0.0beta1/src/Makefile.in	2006-01-17 16:29:54.000000000 -0600
@@ -43,7 +43,7 @@
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-bin_PROGRAMS = gaim$(EXEEXT) $(am__EXEEXT_1)
+bin_PROGRAMS = gaim2$(EXEEXT) $(am__EXEEXT_1)
 subdir = src
 DIST_COMMON = $(am__gaiminclude_HEADERS_DIST) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in getopt.c getopt1.c
@@ -769,7 +769,7 @@
 	internal.h \
 	gtkwhiteboard.h
 
-gaimincludedir = $(includedir)/gaim
+gaimincludedir = $(includedir)/gaim2
 gaiminclude_HEADERS = \
 	$(gaim_coreheaders) \
 	$(gaim_headers)
--- gaim-2.0.0beta1/gaim.desktop.gaim2	2006-01-17 16:41:01.000000000 -0600
+++ gaim-2.0.0beta1/gaim.desktop	2006-01-17 16:41:19.000000000 -0600
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Encoding=UTF-8
 Categories=Application;Network;
-Exec=gaim
-Icon=gaim.png
+Exec=gaim2
+Icon=gaim2.png
 StartupNotify=true
 Terminal=false
 Type=Application
--- gaim-2.0.0beta1/pixmaps/Makefile.in.gaim2	2006-01-17 16:45:58.000000000 -0600
+++ gaim-2.0.0beta1/pixmaps/Makefile.in	2006-01-17 16:46:07.000000000 -0600
@@ -381,7 +381,7 @@
 		change-fgcolor-small.png	\
 		connect.png			\
 		edit.png			\
-		gaim.png			\
+		gaim2.png			\
 		gaim_auth.png			\
 		gaim_cool.png			\
 		gaim_error.png			\
@@ -451,7 +451,7 @@
 gaimdistpixdir = $(datadir)/pixmaps/gaim
 gaimdistpix_DATA = logo.png tb_drag_arrow_down.xpm tb_drag_arrow_left.xpm tb_drag_arrow_right.xpm tb_drag_arrow_up.xpm typed.png typing.png status-online.png status-offline.png status-away.png status-invisible.png status-typing0.png status-typing1.png status-typing2.png status-typing3.png status-connect0.png status-connect1.png status-connect2.png status-connect3.png phone.png
 distpixmapdir = $(datadir)/pixmaps
-distpixmap_DATA = gaim.png
+distpixmap_DATA = gaim2.png
 all: all-recursive
 
 .SUFFIXES:
--- gaim-2.0.0beta1/pixmaps/Makefile.am.gaim2	2006-01-17 16:46:18.000000000 -0600
+++ gaim-2.0.0beta1/pixmaps/Makefile.am	2006-01-17 16:46:24.000000000 -0600
@@ -8,7 +8,7 @@
 		change-fgcolor-small.png	\
 		connect.png			\
 		edit.png			\
-		gaim.png			\
+		gaim2.png			\
 		gaim_auth.png			\
 		gaim_cool.png			\
 		gaim_error.png			\
@@ -83,5 +83,5 @@
 gaimdistpix_DATA = logo.png tb_drag_arrow_down.xpm tb_drag_arrow_left.xpm tb_drag_arrow_right.xpm tb_drag_arrow_up.xpm typed.png typing.png status-online.png status-offline.png status-away.png status-invisible.png status-typing0.png status-typing1.png status-typing2.png status-typing3.png status-connect0.png status-connect1.png status-connect2.png status-connect3.png phone.png
 
 distpixmapdir = $(datadir)/pixmaps
-distpixmap_DATA = gaim.png
+distpixmap_DATA = gaim2.png
 
--- gaim-2.0.0beta1/plugins/musicmessaging/musicmessaging.c.gaim2	2006-01-17 16:55:35.000000000 -0600
+++ gaim-2.0.0beta1/plugins/musicmessaging/musicmessaging.c	2006-01-17 16:55:46.000000000 -0600
@@ -578,7 +578,7 @@
 
 	g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(music_button_toggled), mmconv);
 
-	file_path = g_build_filename(DATADIR, "pixmaps", "gaim", "buttons",
+	file_path = g_build_filename(DATADIR, "pixmaps", "gaim2", "buttons",
 										"music.png", NULL);
 	image = gtk_image_new_from_file(file_path);
 	g_free(file_path);
--- gaim-2.0.0beta1/src/gtkstock.c.gaim2	2006-01-17 16:53:46.000000000 -0600
+++ gaim-2.0.0beta1/src/gtkstock.c	2006-01-17 17:00:34.000000000 -0600
@@ -92,7 +92,7 @@
 	{ GAIM_STOCK_INVITE,          NULL,      GTK_STOCK_JUMP_TO          },
 	{ GAIM_STOCK_LINK,            "buttons", "insert-link-small.png"    },
 	{ GAIM_STOCK_LOG,             NULL,      GTK_STOCK_DND_MULTIPLE     },
-	{ GAIM_STOCK_LOGO,            "gaim",    "logo.png"                 },
+	{ GAIM_STOCK_LOGO,            "gaim2",    "logo.png"                 },
 	{ GAIM_STOCK_MODIFY,          NULL,      GTK_STOCK_PREFERENCES      },
 #if GTK_CHECK_VERSION(2,6,0)
 	{ GAIM_STOCK_PAUSE,           NULL,      GTK_STOCK_MEDIA_PAUSE      },
@@ -114,21 +114,21 @@
 	{ GAIM_STOCK_TEXT_BIGGER,     "buttons", "text_bigger.png"          },
 	{ GAIM_STOCK_TEXT_NORMAL,     "buttons", "text_normal.png"          },
 	{ GAIM_STOCK_TEXT_SMALLER,    "buttons", "text_smaller.png"         },
-	{ GAIM_STOCK_TYPED,           "gaim",    "typed.png"                },
-	{ GAIM_STOCK_TYPING,          "gaim",    "typing.png"               },
-	{ GAIM_STOCK_VOICE_CHAT,      "gaim",    "phone.png"                },
-	{ GAIM_STOCK_STATUS_ONLINE,   "gaim",    "status-online.png"        },
-	{ GAIM_STOCK_STATUS_OFFLINE,  "gaim",    "status-offline.png"       },
-	{ GAIM_STOCK_STATUS_AWAY,     "gaim",    "status-away.png"          },
-	{ GAIM_STOCK_STATUS_INVISIBLE,"gaim",    "status-invisible.png"     },
-	{ GAIM_STOCK_STATUS_TYPING0,  "gaim",    "status-typing0.png"       },
-	{ GAIM_STOCK_STATUS_TYPING1,  "gaim",    "status-typing1.png"       },
-	{ GAIM_STOCK_STATUS_TYPING2,  "gaim",    "status-typing2.png"       },
-	{ GAIM_STOCK_STATUS_TYPING3,  "gaim",    "status-typing3.png"       },
-	{ GAIM_STOCK_STATUS_CONNECT0, "gaim",    "status-connect0.png"      },
-	{ GAIM_STOCK_STATUS_CONNECT1, "gaim",    "status-connect1.png"      },
-	{ GAIM_STOCK_STATUS_CONNECT2, "gaim",    "status-connect2.png"      },
-	{ GAIM_STOCK_STATUS_CONNECT3, "gaim",    "status-connect3.png"      },
+	{ GAIM_STOCK_TYPED,           "gaim2",    "typed.png"                },
+	{ GAIM_STOCK_TYPING,          "gaim2",    "typing.png"               },
+	{ GAIM_STOCK_VOICE_CHAT,      "gaim2",    "phone.png"                },
+	{ GAIM_STOCK_STATUS_ONLINE,   "gaim2",    "status-online.png"        },
+	{ GAIM_STOCK_STATUS_OFFLINE,  "gaim2",    "status-offline.png"       },
+	{ GAIM_STOCK_STATUS_AWAY,     "gaim2",    "status-away.png"          },
+	{ GAIM_STOCK_STATUS_INVISIBLE,"gaim2",    "status-invisible.png"     },
+	{ GAIM_STOCK_STATUS_TYPING0,  "gaim2",    "status-typing0.png"       },
+	{ GAIM_STOCK_STATUS_TYPING1,  "gaim2",    "status-typing1.png"       },
+	{ GAIM_STOCK_STATUS_TYPING2,  "gaim2",    "status-typing2.png"       },
+	{ GAIM_STOCK_STATUS_TYPING3,  "gaim2",    "status-typing3.png"       },
+	{ GAIM_STOCK_STATUS_CONNECT0, "gaim2",    "status-connect0.png"      },
+	{ GAIM_STOCK_STATUS_CONNECT1, "gaim2",    "status-connect1.png"      },
+	{ GAIM_STOCK_STATUS_CONNECT2, "gaim2",    "status-connect2.png"      },
+	{ GAIM_STOCK_STATUS_CONNECT3, "gaim2",    "status-connect3.png"      },
 	{ GAIM_STOCK_UPLOAD,          NULL,      GTK_STOCK_GO_UP            },
 	{ GAIM_STOCK_WARN,            NULL,      GTK_STOCK_DIALOG_WARNING   }
 };
@@ -152,11 +152,11 @@
 	if (base == NULL)
 		return NULL;
 
-	if (!strcmp(dir, "gaim"))
-		filename = g_build_filename(DATADIR, "pixmaps", "gaim", base, NULL);
+	if (!strcmp(dir, "gaim2"))
+		filename = g_build_filename(DATADIR, "pixmaps", "gaim2", base, NULL);
 	else
 	{
-		filename = g_build_filename(DATADIR, "pixmaps", "gaim", dir,
+		filename = g_build_filename(DATADIR, "pixmaps", "gaim2", dir,
 									base, NULL);
 	}
 
--- gaim-2.0.0beta1/src/gtklog.c.gaim2	2006-01-17 16:48:49.000000000 -0600
+++ gaim-2.0.0beta1/src/gtklog.c	2006-01-17 16:49:00.000000000 -0600
@@ -534,7 +534,7 @@
 	}
 	logs = g_list_sort(logs, gaim_log_compare);
 
-	filename = g_build_filename(DATADIR, "pixmaps", "gaim", "icons", "online.png", NULL);
+	filename = g_build_filename(DATADIR, "pixmaps", "gaim2", "icons", "online.png", NULL);
 	pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
 	g_free(filename);
 
--- gaim-2.0.0beta1/src/gtkutils.c.gaim2	2006-01-17 16:49:47.000000000 -0600
+++ gaim-2.0.0beta1/src/gtkutils.c	2006-01-17 16:50:07.000000000 -0600
@@ -479,7 +479,7 @@
 		proto_name = prpl_info->list_icon(NULL, NULL);
 		g_snprintf(buf, sizeof(buf), "%s.png", proto_name);
 
-		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status",
+		filename = g_build_filename(DATADIR, "pixmaps", "gaim2", "status",
 									"default", buf, NULL);
 		pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
 		g_free(filename);
@@ -623,7 +623,7 @@
 			proto_name = prpl_info->list_icon(account, NULL);
 			g_snprintf(buf, sizeof(buf), "%s.png", proto_name);
 
-			filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status",
+			filename = g_build_filename(DATADIR, "pixmaps", "gaim2", "status",
 			                            "default", buf, NULL);
 			pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
 			g_free(filename);
@@ -1570,7 +1570,7 @@
 	 */
 	g_snprintf(buf, sizeof(buf), "%s.png", protoname);
 
-	filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status",
+	filename = g_build_filename(DATADIR, "pixmaps", "gaim2", "status",
 								"default", buf, NULL);
 	status = gdk_pixbuf_new_from_file(filename, NULL);
 	g_free(filename);
@@ -1605,7 +1605,7 @@
 		type_name = "na";
 	g_snprintf(basename2, sizeof(basename2), "%s.png",
 	           type_name);
-	filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default",
+	filename = g_build_filename(DATADIR, "pixmaps", "gaim2", "status", "default",
 	                            basename2, NULL);
 	emblem = gdk_pixbuf_new_from_file(filename, NULL);
 	g_free(filename);
--- gaim-2.0.0beta1/src/gtkconv.c.gaim2	2006-01-17 16:50:35.000000000 -0600
+++ gaim-2.0.0beta1/src/gtkconv.c	2006-01-17 16:50:44.000000000 -0600
@@ -2982,7 +2982,7 @@
 		return NULL;
 	}
 
-	filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", image, NULL);
+	filename = g_build_filename(DATADIR, "pixmaps", "gaim2", "status", "default", image, NULL);
 	pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
 	g_free(filename);
 
@@ -2993,7 +2993,7 @@
 	g_object_unref(pixbuf);
 
 	if (flags && gaim_conv_chat_is_user_ignored(chat, name)) {
-		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", "ignored.png", NULL);
+		filename = g_build_filename(DATADIR, "pixmaps", "gaim2", "status", "default", "ignored.png", NULL);
 		pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
 		g_free(filename);
 		scale2 = gdk_pixbuf_scale_simple(pixbuf, 15, 15, GDK_INTERP_BILINEAR);
--- gaim-2.0.0beta1/src/gtkblist.c.gaim2	2006-01-17 16:47:28.000000000 -0600
+++ gaim-2.0.0beta1/src/gtkblist.c	2006-01-17 16:47:57.000000000 -0600
@@ -2788,16 +2788,16 @@
 	}
 
 	if(buddy && GAIM_BUDDY_IS_ONLINE(buddy) &&  gtkbuddynode && gtkbuddynode->recent_signonoff) {
-			filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", "login.png", NULL);
+			filename = g_build_filename(DATADIR, "pixmaps", "gaim2", "status", "default", "login.png", NULL);
 	} else if(buddy && !GAIM_BUDDY_IS_ONLINE(buddy) && gtkbuddynode && gtkbuddynode->recent_signonoff) {
-			filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", "logout.png", NULL);
+			filename = g_build_filename(DATADIR, "pixmaps", "gaim2", "status", "default", "logout.png", NULL);
 	} else if(buddy || chat) {
 		char *image = g_strdup_printf("%s.png", protoname);
-		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", image, NULL);
+		filename = g_build_filename(DATADIR, "pixmaps", "gaim2", "status", "default", image, NULL);
 		g_free(image);
 	} else {
 		/* gaim dude */
-		filename = g_build_filename(DATADIR, "pixmaps", "gaim.png", NULL);
+		filename = g_build_filename(DATADIR, "pixmaps", "gaim2.png", NULL);
 	}
 
 	status = gdk_pixbuf_new_from_file(filename, NULL);
@@ -2814,7 +2814,7 @@
 		if(emblems[i].filename) {
 			GdkPixbuf *emblem;
 			char *image = g_strdup_printf("%s.png", emblems[i].filename);
-			filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", image, NULL);
+			filename = g_build_filename(DATADIR, "pixmaps", "gaim2", "status", "default", image, NULL);
 			g_free(image);
 			emblem = gdk_pixbuf_new_from_file(filename, NULL);
 			g_free(filename);
@@ -2854,7 +2854,7 @@
 		if (!gaim_privacy_check(buddy->account, gaim_buddy_get_name(buddy)))
 		{
 			GdkPixbuf *emblem;
-			char *filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", "blocked.png", NULL);
+			char *filename = g_build_filename(DATADIR, "pixmaps", "gaim2", "status", "default", "blocked.png", NULL);
 
 			emblem = gdk_pixbuf_new_from_file(filename, NULL);
 			g_free(filename);
--- gaim-2.0.0beta1/src/gtksound.c.gaim2	2006-01-17 17:00:42.000000000 -0600
+++ gaim-2.0.0beta1/src/gtksound.c	2006-01-17 17:01:04.000000000 -0600
@@ -556,7 +556,7 @@
 		char *filename = g_strdup(gaim_prefs_get_string(file_pref));
 		if(!filename || !strlen(filename)) {
 			if(filename) g_free(filename);
-			filename = g_build_filename(DATADIR, "sounds", "gaim", sounds[event].def, NULL);
+			filename = g_build_filename(DATADIR, "sounds", "gaim2", sounds[event].def, NULL);
 		}
 
 		gaim_sound_play_file(filename, NULL);
--- gaim-2.0.0beta1/src/gtkthemes.c.gaim2	2006-01-17 16:53:15.000000000 -0600
+++ gaim-2.0.0beta1/src/gtkthemes.c	2006-01-17 16:53:37.000000000 -0600
@@ -217,7 +217,7 @@
 	int l;
 
 	char* probedirs[3];
-	probedirs[0] = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", NULL);
+	probedirs[0] = g_build_filename(DATADIR, "pixmaps", "gaim2", "smileys", NULL);
 	probedirs[1] = g_build_filename(gaim_user_dir(), "smileys", NULL);
 	probedirs[2] = 0;
 	for (l=0; probedirs[l]; l++) {
--- gaim-2.0.0beta1/src/gtkmain.c.gaim2	2006-01-17 16:49:06.000000000 -0600
+++ gaim-2.0.0beta1/src/gtkmain.c	2006-01-17 16:49:35.000000000 -0600
@@ -222,7 +222,7 @@
 
 #ifndef _WIN32
 	/* use the nice PNG icon for all the windows */
-	icon_path = g_build_filename(DATADIR, "pixmaps", "gaim", "icons", "online.png", NULL);
+	icon_path = g_build_filename(DATADIR, "pixmaps", "gaim2", "icons", "online.png", NULL);
 	icon = gdk_pixbuf_new_from_file(icon_path, NULL);
 	g_free(icon_path);
 	if (icon) {
--- gaim-2.0.0beta1/src/prefs.c.gaim2	2006-01-17 17:01:38.000000000 -0600
+++ gaim-2.0.0beta1/src/prefs.c	2006-01-17 17:01:57.000000000 -0600
@@ -340,7 +340,7 @@
 
 		error = NULL;
 
-		filename = g_build_filename(SYSCONFDIR, "gaim", "prefs.xml", NULL);
+		filename = g_build_filename(SYSCONFDIR, "gaim2", "prefs.xml", NULL);
 
 		gaim_debug_info("prefs", "Reading %s\n", filename);
 
--- gaim-2.0.0beta1/src/gtkdnd-hints.c.gaim2	2006-01-17 16:48:28.000000000 -0600
+++ gaim-2.0.0beta1/src/gtkdnd-hints.c	2006-01-17 16:48:33.000000000 -0600
@@ -122,7 +122,7 @@
 	for (i = 0; hint_windows[i].filename != NULL; i++) {
 		gchar *fname;
 
-		fname = g_build_filename(DATADIR, "pixmaps", "gaim",
+		fname = g_build_filename(DATADIR, "pixmaps", "gaim2",
 								 hint_windows[i].filename, NULL);
 
 		hint_windows[i].widget = dnd_hints_init_window(fname);
--- gaim-2.0.0beta1/configure.gaim2	2006-01-17 17:11:05.000000000 -0600
+++ gaim-2.0.0beta1/configure	2006-01-17 17:12:13.000000000 -0600
@@ -42170,7 +42170,7 @@
   "src/protocols/toc/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/protocols/toc/Makefile" ;;
   "src/protocols/yahoo/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/protocols/yahoo/Makefile" ;;
   "src/protocols/zephyr/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/protocols/zephyr/Makefile" ;;
-  "gaim.pc" ) CONFIG_FILES="$CONFIG_FILES gaim.pc" ;;
+  "gaim2.pc" ) CONFIG_FILES="$CONFIG_FILES gaim2.pc" ;;
   "gaim.spec" ) CONFIG_FILES="$CONFIG_FILES gaim.spec" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
--- gaim-2.0.0beta1/Makefile.in.gaim2	2006-01-17 17:24:03.000000000 -0600
+++ gaim-2.0.0beta1/Makefile.in	2006-01-17 17:24:21.000000000 -0600
@@ -41,7 +41,7 @@
 DIST_COMMON = README $(am__configure_deps) $(gaiminclude_HEADERS) \
 	$(srcdir)/Doxyfile.in $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(srcdir)/gaim.apspec.in $(srcdir)/gaim.pc.in \
+	$(srcdir)/gaim.apspec.in $(srcdir)/gaim2.pc.in \
 	$(srcdir)/gaim.spec.in $(top_srcdir)/configure \
 	$(top_srcdir)/intl/Makefile.in \
 	$(top_srcdir)/plugins/perl/common/Makefile.PL.in ABOUT-NLS \
@@ -60,7 +60,7 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = Doxyfile gaim.apspec intl/Makefile \
-	plugins/perl/common/Makefile.PL gaim.pc gaim.spec
+	plugins/perl/common/Makefile.PL gaim2.pc gaim.spec
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -492,7 +492,7 @@
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 plugins/perl/common/Makefile.PL: $(top_builddir)/config.status $(top_srcdir)/plugins/perl/common/Makefile.PL.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-gaim2.pc: $(top_builddir)/config.status $(srcdir)/gaim.pc.in
+gaim2.pc: $(top_builddir)/config.status $(srcdir)/gaim2.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 gaim.spec: $(top_builddir)/config.status $(srcdir)/gaim.spec.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
--- gaim-2.0.0beta1/Makefile.am.gaim2	2006-01-17 17:23:35.000000000 -0600
+++ gaim-2.0.0beta1/Makefile.am	2006-01-17 17:23:57.000000000 -0600
@@ -1,10 +1,10 @@
 EXTRA_DIST = \
 		COPYRIGHT \
 		Doxyfile.in \
-		gaim.pc.in \
+		gaim2.pc.in \
 		gaim.spec.in \
 		gaim.apspec.in \
-		gaim.desktop \
+		gaim2.desktop \
 		gaim-installer.nsi \
 		HACKING \
 		PROGRAMMING_NOTES \
@@ -27,7 +27,7 @@
 gaiminclude_HEADERS = config.h
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gaim.pc
+pkgconfig_DATA = gaim2.pc
 
 dist-hook: gaim.spec
 	cp gaim.spec $(distdir)
@@ -36,7 +36,7 @@
 #	cp plugins/perl/common/Gaim.pm $(distdir)/plugins/perl/common
 
 appsdir = $(datadir)/applications
-apps_DATA = gaim.desktop
+apps_DATA = gaim2.desktop
 
 SUBDIRS = doc intl m4macros pixmaps plugins po sounds src
 
--- gaim-2.0.0beta1/configure.gaim2	2006-01-17 17:22:32.000000000 -0600
+++ gaim-2.0.0beta1/configure	2006-01-17 17:23:16.000000000 -0600
@@ -41213,7 +41213,7 @@
 
 
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      ac_config_files="$ac_config_files Makefile Doxyfile gaim.apspec doc/Makefile doc/gaim.1 intl/Makefile m4macros/Makefile pixmaps/Makefile pixmaps/smileys/Makefile pixmaps/smileys/default/Makefile pixmaps/smileys/none/Makefile pixmaps/status/Makefile pixmaps/status/default/Makefile plugins/Makefile plugins/docklet/Makefile plugins/gevolution/Makefile plugins/gestures/Makefile plugins/mono/Makefile plugins/mono/api/Makefile plugins/mono/loader/Makefile plugins/musicmessaging/Makefile plugins/perl/Makefile plugins/pe!
 rl/common/Makefile.PL plugins/ssl/Makefile plugins/tcl/Makefile plugins/ticker/Makefile po/Makefile.in sounds/Makefile src/Makefile src/mediastreamer/Makefile src/protocols/Makefile src/protocols/bonjour/Makefile src/protocols/gg/Makefile src/protocols/irc/Makefile src/protocols/jabber/Makefile src/protocols/msn/Makefile src/protocols/napster/Makefile src/protocols/novell/Makefile src/protocols/oscar/Makefile src/protocols/sametime/Makefile src/protocols/silc/Makefile src/protocols/simple/Makefile src/protocols/toc/Makefile src/protocols/yahoo/Makefile src/protocols/zephyr/Makefile gaim.pc gaim.spec"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      ac_config_files="$ac_config_files Makefile Doxyfile gaim.apspec doc/Makefile doc/gaim.1 intl/Makefile m4macros/Makefile pixmaps/Makefile pixmaps/smileys/Makefile pixmaps/smileys/default/Makefile pixmaps/smileys/none/Makefile pixmaps/status/Makefile pixmaps/status/default/Makefile plugins/Makefile plugins/docklet/Makefile plugins/gevolution/Makefile plugins/gestures/Makefile plugins/mono/Makefile plugins/mono/api/Makefile plugins/mono/loader/Makefile plugins/musicmessaging/Makefile plugins/perl/Makefile plugins/pe!
 rl/common/Makefile.PL plugins/ssl/Makefile plugins/tcl/Makefile plugins/ticker/Makefile po/Makefile.in sounds/Makefile src/Makefile src/mediastreamer/Makefile src/protocols/Makefile src/protocols/bonjour/Makefile src/protocols/gg/Makefile src/protocols/irc/Makefile src/protocols/jabber/Makefile src/protocols/msn/Makefile src/protocols/napster/Makefile src/protocols/novell/Makefile src/protocols/oscar/Makefile src/protocols/sametime/Makefile src/protocols/silc/Makefile src/protocols/simple/Makefile src/protocols/toc/Makefile src/protocols/yahoo/Makefile src/protocols/zephyr/Makefile gaim2.pc gaim.spec"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
--- gaim-2.0.0beta1/src/Makefile.in.gaim2	2006-01-17 17:32:39.000000000 -0600
+++ gaim-2.0.0beta1/src/Makefile.in	2006-01-17 17:32:56.000000000 -0600
@@ -899,7 +899,7 @@
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
 	done
-gaim$(EXEEXT): $(gaim_OBJECTS) $(gaim_DEPENDENCIES) 
+gaim2$(EXEEXT): $(gaim_OBJECTS) $(gaim_DEPENDENCIES) 
 	@rm -f gaim$(EXEEXT)
 	$(LINK) $(gaim_LDFLAGS) $(gaim_OBJECTS) $(gaim_LDADD) $(LIBS)
 gaim-client-example$(EXEEXT): $(gaim_client_example_OBJECTS) $(gaim_client_example_DEPENDENCIES) 
--- gaim-2.0.0beta1/m4macros/Makefile.in.BAD	2006-01-17 22:05:25.000000000 -0600
+++ gaim-2.0.0beta1/m4macros/Makefile.in	2006-01-17 22:05:34.000000000 -0600
@@ -355,7 +355,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-installed_m4 = gaim.m4
+installed_m4 = gaim2.m4
 EXTRA_DIST = $(installed_m4)
 m4datadir = $(datadir)/aclocal
 m4data_DATA = $(installed_m4)
--- gaim-2.0.0beta1/configure.BAD	2006-01-17 22:19:00.000000000 -0600
+++ gaim-2.0.0beta1/configure	2006-01-17 22:19:20.000000000 -0600
@@ -421,7 +421,7 @@
 : ${ac_max_here_lines=38}
 
 # Identity of this package.
-PACKAGE_NAME='gaim'
+PACKAGE_NAME='gaim2'
 PACKAGE_TARNAME='gaim'
 PACKAGE_VERSION='2.0.0-0.1.beta1'
 PACKAGE_STRING='gaim 2.0.0-0.1.beta1'
--- gaim-2.0.0beta1/src/Makefile.am.BAD	2006-01-17 22:19:59.000000000 -0600
+++ gaim-2.0.0beta1/src/Makefile.am	2006-01-17 22:20:38.000000000 -0600
@@ -169,7 +169,7 @@
 	dbus-bindings.c \
 	dbus-client-binding.c \
 	dbus-client-binding.h \
-	gaim.service \
+	gaim2.service \
 	dbus-types.c \
 	dbus-types.h
 
@@ -232,17 +232,17 @@
 bin_SCRIPTS = gaim-remote.py gaim-notifications-example.py gaim-send gaim-send-async
 
 
-# gaim.service
+# gaim2.service
 
-gaim.service:
+gaim2.service:
 	echo "[Gaim]" > $@
 	echo "Name=org.gaim.GaimService" >> $@
-	echo "Exec=$(bindir)/gaim" >> $@
+	echo "Exec=$(bindir)/gaim2" >> $@
 
 #Ideally, this directory should be autodetected, and the user should
 #be able to specify it as an option to "configure"
 dbus_sessiondir = $(DBUS_SESSION_DIR)
-dbus_session_DATA = gaim.service
+dbus_session_DATA = gaim2.service
 
 endif
 
--- gaim-2.0.0beta1/src/Makefile.in.BAD	2006-01-17 22:20:49.000000000 -0600
+++ gaim-2.0.0beta1/src/Makefile.in	2006-01-17 22:21:04.000000000 -0600
@@ -644,7 +644,7 @@
 @ENABLE_DBUS_TRUE@	dbus-bindings.c \
 @ENABLE_DBUS_TRUE@	dbus-client-binding.c \
 @ENABLE_DBUS_TRUE@	dbus-client-binding.h \
- ENABLE_DBUS_TRUE@	gaim.service \
+ ENABLE_DBUS_TRUE@	gaim2.service \
 @ENABLE_DBUS_TRUE@	dbus-types.c \
 @ENABLE_DBUS_TRUE@	dbus-types.h
 
@@ -677,7 +677,7 @@
 #Ideally, this directory should be autodetected, and the user should
 #be able to specify it as an option to "configure"
 @ENABLE_DBUS_TRUE dbus_sessiondir = $(DBUS_SESSION_DIR)
- ENABLE_DBUS_TRUE@dbus_session_DATA = gaim.service
+ ENABLE_DBUS_TRUE@dbus_session_DATA = gaim2.service
 gaim_SOURCES = \
 	$(gaim_coresources) \
 	$(dbus_sources) \
@@ -1397,12 +1397,12 @@
 
 @ENABLE_DBUS_TRUE gaim-client-example $(OBJEXT): gaim-client-bindings.h
 
-# gaim.service
+# gaim2.service
 
- ENABLE_DBUS_TRUE@gaim.service:
+ ENABLE_DBUS_TRUE@gaim2.service:
 @ENABLE_DBUS_TRUE@	echo "[Gaim]" > $@
 @ENABLE_DBUS_TRUE@	echo "Name=org.gaim.GaimService" >> $@
- ENABLE_DBUS_TRUE@	echo "Exec=$(bindir)/gaim" >> $@
+ ENABLE_DBUS_TRUE@	echo "Exec=$(bindir)/gaim2" >> $@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
--- gaim-2.0.0beta1/sounds/Makefile.in.BAD	2006-01-17 22:22:29.000000000 -0600
+++ gaim-2.0.0beta1/sounds/Makefile.in	2006-01-17 22:22:41.000000000 -0600
@@ -362,7 +362,7 @@
 		receive.wav \
 		send.wav
 
-soundsdir = $(datadir)/sounds/gaim
+soundsdir = $(datadir)/sounds/gaim2
 sounds_DATA = $(EXTRA_DIST)
 all: all-am
 
--- gaim-2.0.0beta1/po/Makefile.in.in.BAD	2006-01-17 22:38:23.000000000 -0600
+++ gaim-2.0.0beta1/po/Makefile.in.in	2006-01-17 22:38:26.000000000 -0600
@@ -6,7 +6,7 @@
 # but which still want to provide support for the GNU gettext functionality.
 # Please note that the actual code is *not* freely available.
 
-PACKAGE = @PACKAGE@
+PACKAGE = @PACKAGE 2
 VERSION = @VERSION@
 
 # These two variables depend on the location of this directory.

gaim2-PIE.patch:
 Makefile.in |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE gaim2-PIE.patch ---
--- gaim-2.0.0beta1/src/Makefile.in.BAD	2006-01-17 15:38:08.000000000 -0600
+++ gaim-2.0.0beta1/src/Makefile.in	2006-01-17 15:38:39.000000000 -0600
@@ -140,13 +140,13 @@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fPIE
 LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+	$(AM_CFLAGS) $(CFLAGS) -fPIE
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@ -pie
 SOURCES = $(libgaim_client_la_SOURCES) $(gaim_SOURCES) \
 	$(gaim_client_example_SOURCES)
 DIST_SOURCES = $(am__libgaim_client_la_SOURCES_DIST) \


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore	12 Aug 2005 04:36:10 -0000	1.33
+++ .cvsignore	27 Jun 2006 17:53:21 -0000	1.34
@@ -1 +1 @@
-gaim-1.5.0.tar.bz2
+gaim-2.0.0beta3.tar.bz2


Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- gaim.spec	18 May 2006 09:04:01 -0000	1.120
+++ gaim.spec	27 Jun 2006 17:53:21 -0000	1.121
@@ -10,17 +10,29 @@
 %define evolution_integration	1
 # OPTION: SILC integration (FC3+)
 %define silc_integration	1
-# OPTION: Standalone NSS (FC5+)
-%define standalone_nss		1
+# OPTION: Mono integration (FC5+)
+%define mono_integration	0
+# OPTION: dbus integration (FC5+)
+%define dbus_integration	1
+
+# OPTION: Howl integration (seems broken)
+%define howl_integration	0
+# OPTION: gadugadu integration (not shipped in core)
+%define gadugadu_integration	0
+# OPTION: Meanwhile integration (not shipped in core)
+%define meanwhile_integration	0
+
+# Prerelease define
+%define betaver	beta3
 
 Name:		gaim
-Version:	1.5.0
-Release:        19.fc6
-Epoch:		1
+Version:	2.0.0
+Release:	0.3.%{betaver}%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://gaim.sourceforge.net/
-Source0:	http://prdownloads.sourceforge.net/gaim/gaim-%{version}.tar.bz2
+Source0:	http://download.sourceforge.net/gaim/gaim-%{version}%{betaver}.tar.bz2
+Epoch:		2
 
 ## Fedora gaim defaults - Please Regenerate for Each Major Release
 # 1) run gaim as new user 2) edit preferences 3) close 4) copy .gaim/prefs.xml
@@ -38,62 +50,25 @@
 
 ## Patches 0-99: Fedora specific or upstream wont accept
 # to be replaced by upstream fix
-Patch4:		gaim-0.76-xinput.patch
-Patch5:		gaim-1.3.1-PIE.patch
-# GNOME running check is naive and wrong for both KDE and older distributions
-Patch6:		gaim-1.0.1-naive-gnome-check.patch
-
-## Patches 100-199: Upstream CVS Backports
-Patch156: gaim-1.5.0-yahoo-chatroom-ignore-on-join.patch
-Patch157: gaim-1.5.0-it-yahoo_profile.patch
-Patch158: gaim-1.5.0-strip-html-status.patch
-Patch159: gaim-1.5.0-xmlnode-cleanup.patch
-Patch160: gaim-1.5.0-crash-non-terminated-strings.patch
-Patch161: gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p1.patch
-Patch162: gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p2.patch
-Patch163: gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p3.patch
-Patch164: gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p4.patch
-Patch165: gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p5.patch
-Patch166: gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p6.patch
-Patch167: gaim-1.5.0-msn-data-corruption-fix.patch
-Patch168: gaim-1.5.0-msn-kill-convo-close-timeout-notices-p1.patch
-Patch169: gaim-1.5.0-msn-kill-convo-close-timeout-notices-p2.patch
-Patch170: gaim-1.5.0-msn-kill-convo-close-timeout-notices-p3.patch
-Patch171: gaim-1.5.0-forceful-connection_disconnect-not-wipe-password.patch
-Patch172: gaim-1.5.0-clipboard-leak-history-scroll.patch
-Patch173: gaim-1.5.0-smileys-logtype-p1.patch
-Patch174: gaim-1.5.0-smileys-logtype-p2.patch
-Patch175: gaim-1.5.0-italics-ircs.patch
-Patch176: gaim-1.5.0-authors.patch
-Patch177: gaim-1.5.0-copyright.patch
-Patch178: gaim-1.5.0-hacking-doc.patch
-Patch179: gaim-1.5.0-doc-creation.patch
-Patch180: gaim-1.5.0-aim-rate-limiting.patch
-Patch181: gaim-1.5.0-nss-detect.patch
-Patch182: gaim-1.5.0-logging-compatibility.patch
-Patch183: gaim-1.5.0-msn-block-crash.patch
-Patch184: gaim-1.5.0-silc-CID-71.patch
+Patch5:		gaim2-PIE.patch
+Patch6:		gaim-2.0.0beta1-gaim2.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
-Provides:	gaim-devel = %{epoch}:%{version}-%{release}
 
 # Require Binary Compatible glib
 # returns bogus value if glib2-devel is not installed in order for parsing to succeed
 # bogus value wont make it into a real package
 %define glib_ver %([ -a %{_libdir}/pkgconfig/glib-2.0.pc ] && pkg-config --modversion glib-2.0 | cut -d. -f 1,2 || echo -n "999")
+BuildRequires:	glib2-devel
 Requires:       glib2 >= %{glib_ver}
 
 # Basic Library Requirements
 BuildRequires:	libao-devel, startup-notification-devel, audiofile-devel
-
+BuildRequires:  cyrus-sasl-devel
 BuildRequires:	mozilla-nss-devel
 BuildRequires:	gtk2-devel
-BuildRequires:  desktop-file-utils
-BuildRequires:  libICE-devel
-BuildRequires:  libSM-devel
-BuildRequires:  libX11-devel
-BuildRequires:  libXext-devel
+BuildRequires:  gettext
 BuildRequires:  libXScrnSaver-devel
 
 # krb5 needed for Zephyr (FC1+)
@@ -118,6 +93,27 @@
 %if %{silc_integration}
 BuildRequires:	libsilc-devel
 %endif
+# Mono integration (FC5+)
+%if %{mono_integration}
+BuildRequires:	mono-devel
+%endif
+# DBus integration (FC5+)
+%if %{dbus_integration}
+BuildRequires:	dbus-devel >= 0.35
+%endif
+
+# Howl integration (seems to be broken)
+%if %{howl_integration}
+BuildRequires:	avahi-devel
+%endif
+# Meanwhile integration (not shipped in core)
+%if %{meanwhile_integration}
+BuildRequires:	meanwhile-devel
+%endif
+# Gadugadu integration (not shipped in core)
+%if %{gadugadu_integration}
+BuildRequires:	ekg-devel
+%endif
 
 %description
 Gaim allows you to talk to anyone using a variety of messaging 
@@ -134,49 +130,23 @@
 providers.
 
 
+%package devel
+Summary: Development headers and libraries for gaim
+Group: Development/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description devel
+This package contains the files necessary to develop or compile code
+that depends on gaim.
+
 
 
 %prep
-%setup -q
-%patch4 -p1
-#patch5 happens after configure, yes this sucks
-%patch6 -p1
-
-# CVS backports go here
-%patch156 -p0
-%patch157 -p0
-%patch158 -p0
-%patch159 -p0
-%patch160 -p0
-%patch161 -p0
-%patch162 -p0
-%patch163 -p0
-%patch164 -p0
-%patch165 -p0
-%patch166 -p0
-%patch167 -p0
-%patch168 -p0
-%patch169 -p0
-%patch170 -p0
-%patch171 -p0
-%patch172 -p0
-%patch173 -p0
-%patch174 -p0
-%patch175 -p0
-%patch176 -p0
-%patch177 -p0
-%patch178 -p0
-%patch179 -p0
-%patch180 -p2
-%if %{standalone_nss}
-%patch181 -p1
-%endif
-%patch182 -p0
-%patch183 -p2
-%patch184 -p2
+%setup -q -n gaim-%{version}%{betaver}
+%patch5 -p1
 
 # Relabel internal version for support purposes
-sed -i "s/%{version}/%{version}-%{release}/g" configure
+sed -i "s/%{version}%{betaver}/%{version}-%{release}/g" configure
 chmod 755 configure
 
 # If not using gnome-open, then default to htmlview 
@@ -201,26 +171,33 @@
 %else
 	WITH_PERL="--disable-perl"
 %endif
+%if %{howl_integration}
+	WITH_HOWL="--with-howl-includes=/usr/include/avahi-compat-howl/"
+%endif
+%if %{mono_integration}
+	WITH_MONO="--enable-mono"
+%else
+	WITH_MONO="--disable-mono"
+%endif
+%if %{dbus_integration}
+	WITH_DBUS="--enable-dbus"
+%else
+	WITH_DBUS="--disable-dbus"
+%endif
+
 
 # FC5+ automatic -fstack-protector-all switch
 export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all}
-# Use relro opt flag, compiler simply ignores this in < FC3
-export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wl,-z,relro"
-# Use FORTIFY_SOURCE if it is not already in opt flags
-# compiler simply ignores this in < FC3
-echo $RPM_OPT_FLAGS | grep -q "FORTIFY_SOURCE" || export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wp,-D_FORTIFY_SOURCE=2"
 export CFLAGS="$RPM_OPT_FLAGS"
 
 # disable tcl and tk because nobody uses it
 # gnutls is buggy so use mozilla-nss on all distributions
-%configure --disable-tcl --disable-tk --enable-gnutls=no --enable-nss=yes $WITH_KRB $WITH_SILC $WITH_PERL
-
-# Abort build if NSS was not detected
-grep -q "#define HAVE_NSS 1" config.h || exit 1
-
-# patch Makefile for PIE
-patch -p1 < %{PATCH5}
-make %{?_smp_mflags}
+%configure --disable-tcl --disable-tk --enable-gnutls=no --enable-nss=yes \
+           --enable-cyrus-sasl \
+	   $WITH_KRB $WITH_SILC $WITH_PERL $WITH_HOWL $WITH_MONO \
+	   $WITH_SASL $WITH_DBUS
+# smp_mflags breaks the mono plugin
+make
 
 
 %install
@@ -252,11 +229,23 @@
 # so that they are properly stripped
 chmod -R u+w $RPM_BUILD_ROOT/*
 
-%find_lang %{name}
+%find_lang gaim
 
 
 %post 
 /sbin/ldconfig -n %{_libdir}/gaim
+# This is a hack that we have to do. Mono apps need mono_exec_t. Since gaim doesn't 
+# call /usr/bin/mono to run its mono bits, the existing selinux policy misses this.
+#/usr/bin/chcon -t mono_exec_t /usr/bin/gaim 
+
+# XXX: This line above fails on non-selinux systems with a non-zero return code.
+# Changing the selinux context here would also cause rpm -V and TPS failure.
+# Can't we find a better solution for this?
+
+# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=196877
+# There is also concern that we don't want gaim to run with this security context
+# due to its historical security track record.  For now we are disaling mono
+# temporarily until we decide a long term solution.
 
 %postun
 /sbin/ldconfig -n %{_libdir}/gaim
@@ -264,49 +253,47 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %{name}.lang
+%files -f gaim.lang
 %defattr(-,root,root,-)
 %doc doc/CREDITS NEWS COPYING AUTHORS doc/FAQ README ChangeLog doc/PERL-HOWTO.dox
-#%%config %{_sysconfdir}/CORBA/servers/gaim_applet.gnorba
 %{_bindir}/*
-%{_libdir}/gaim
-%{_includedir}/gaim
+%{_libdir}/gaim/
 %{_libdir}/pkgconfig/gaim.pc
-%{_libdir}/libgaim*.so*
-%{_mandir}/*/*
-#%%{_datadir}/applets/Network/gaim_applet.desktop
+%{_libdir}/libgaim-client.so.*
+%{_mandir}/man1/*
+%{_mandir}/man3/*
+%{_datadir}/aclocal/gaim.m4
 %{_datadir}/applications/gaim.desktop
-%{_datadir}/pixmaps/gaim
+%{_datadir}/dbus-1/services/gaim.service
+%{_datadir}/pixmaps/gaim/
 %{_datadir}/pixmaps/gaim.png
-%{_datadir}/sounds/gaim
-#%%{_datadir}/pixmaps/gaim/*
-%{_sysconfdir}/gaim/prefs.xml
-%dir %{_sysconfdir}/gaim
+%{_datadir}/pixmaps/gaim.svg
+%{_datadir}/sounds/gaim/
+%{_sysconfdir}/gaim/
 %if %{perl_integration}
 %{perl_vendorarch}/Gaim*
 %{perl_vendorarch}/auto/Gaim/
 %endif
 
-%changelog
-* Thu May 18 2006 Karsten Hopp <karsten redhat de> 1.5.0-19.fc6
-- bump release and rebuild
-
-* Wed May 17 2006 Karsten Hopp <karsten redhat de> 1.5.0-18.fc6
-- add some missing buildrequires: libICE-devel, libSM-devel
-  libX11-devel, libXext-devel, libXScrnSaver-devel
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/gaim/
+%{_libdir}/libgaim-client.so
 
-* Fri Apr 28 2006 Warren Togami <wtogami redhat com> - 1:1.5.0-17
-- 184: silc crash fix (#190152)
+%changelog
+* Tue Jun 27 2006 Warren Togami <wtogami redhat com> 2.0.0-0.3.beta3
+- more spec cleanups
+- buildreq libXScrnSaver-devel and gettext
+- disable mono for now due to #196877
 
-* Sat Apr 08 2006 Warren Togami <wtogami redhat com> - 1:1.5.0-16
-- MSN block crash (#185222 Stu Tomlinson)
+* Mon Jun 26 2006 Tom "spot" Callaway <tcallawa redhat com>
+- split out -devel package to meet guidelines
 
-* Tue Feb 07 2006 Warren Togami <wtogami redhat com> 1:1.5.0-15
-- allow compat with gaim-2.x log format (rlaager)
+* Mon Jan 23 2006 Tom "spot" Callaway <tcallawa redhat com>
+- gaim2 version of the spec
 
-* Fri Jan 13 2006 Warren Togami <wtogami redhat com> 1:1.5.0-13
-- buildreq desktop-file-utils (ivazquez #176688)
-- detect NSS in a generic way and abort on failure
+* Fri Dec 09 2005 Jesse Keating <jkeating redhat com>
+- rebuilt
 
 * Thu Nov 10 2005 Warren Togami <wtogami redhat com> - 1:1.5.0-9
 - Ensure that security opt flags are used (#165795)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	12 Aug 2005 04:36:13 -0000	1.33
+++ sources	27 Jun 2006 17:53:21 -0000	1.34
@@ -1 +1 @@
-9205321ac11fad271c90f2f0d7c5e7ce  gaim-1.5.0.tar.bz2
+c077655e4dd251cf22c406777c985a74  gaim-2.0.0beta3.tar.bz2


--- gaim-0.76-xinput.patch DELETED ---


--- gaim-1.0.1-naive-gnome-check.patch DELETED ---


--- gaim-1.3.1-PIE.patch DELETED ---


--- gaim-1.5.0-aim-rate-limiting.patch DELETED ---


--- gaim-1.5.0-authors.patch DELETED ---


--- gaim-1.5.0-clipboard-leak-history-scroll.patch DELETED ---


--- gaim-1.5.0-copyright.patch DELETED ---


--- gaim-1.5.0-crash-non-terminated-strings.patch DELETED ---


--- gaim-1.5.0-doc-creation.patch DELETED ---


--- gaim-1.5.0-forceful-connection_disconnect-not-wipe-password.patch DELETED ---


--- gaim-1.5.0-hacking-doc.patch DELETED ---


--- gaim-1.5.0-it-yahoo_profile.patch DELETED ---


--- gaim-1.5.0-italics-ircs.patch DELETED ---


--- gaim-1.5.0-logging-compatibility.patch DELETED ---


--- gaim-1.5.0-msn-block-crash.patch DELETED ---


--- gaim-1.5.0-msn-data-corruption-fix.patch DELETED ---


--- gaim-1.5.0-msn-kill-convo-close-timeout-notices-p1.patch DELETED ---


--- gaim-1.5.0-msn-kill-convo-close-timeout-notices-p2.patch DELETED ---


--- gaim-1.5.0-msn-kill-convo-close-timeout-notices-p3.patch DELETED ---


--- gaim-1.5.0-nss-detect.patch DELETED ---


--- gaim-1.5.0-silc-CID-71.patch DELETED ---


--- gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p1.patch DELETED ---


--- gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p2.patch DELETED ---


--- gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p3.patch DELETED ---


--- gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p4.patch DELETED ---


--- gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p5.patch DELETED ---


--- gaim-1.5.0-silc-close-gaim_request-window-prpl-disconnect-p6.patch DELETED ---


--- gaim-1.5.0-smileys-logtype-p1.patch DELETED ---


--- gaim-1.5.0-smileys-logtype-p2.patch DELETED ---


--- gaim-1.5.0-strip-html-status.patch DELETED ---


--- gaim-1.5.0-xmlnode-cleanup.patch DELETED ---


--- gaim-1.5.0-yahoo-chatroom-ignore-on-join.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]