rpms/gaim-meanwhile/devel gaim-2.0.0beta6-fix-buggy-fetch-url.diff, NONE, 1.1 gaim-meanwhile.spec, 1.18, 1.19 gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch, 1.1, NONE gaim-2.0.0beta5-debian-03_gconf-gstreamer.patch, 1.1, NONE

[Joshua W. Boyer (jwboyer)]

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18154

Modified Files:
	gaim-meanwhile.spec 
Added Files:
	gaim-2.0.0beta6-fix-buggy-fetch-url.diff 
Removed Files:
	gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch 
	gaim-2.0.0beta5-debian-03_gconf-gstreamer.patch 
Log Message:
Rebuild against latest core package


gaim-2.0.0beta6-fix-buggy-fetch-url.diff:

--- NEW FILE gaim-2.0.0beta6-fix-buggy-fetch-url.diff ---
Index: libgaim/util.c
===================================================================
--- libgaim/util.c	(revision 18201)
+++ libgaim/util.c	(working copy)
@@ -3150,6 +3150,11 @@
 		g_free(gfud->request);
 		gfud->request = NULL;
 
+		gaim_input_remove(gfud->inpa);
+		gfud->inpa = 0;
+		close(gfud->fd);
+		gfud->fd = -1;
+
 		g_free(gfud->website.user);
 		g_free(gfud->website.passwd);
 		g_free(gfud->website.address);


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/gaim-meanwhile.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gaim-meanwhile.spec	15 Mar 2007 13:24:50 -0000	1.18
+++ gaim-meanwhile.spec	29 Mar 2007 01:47:12 -0000	1.19
@@ -33,7 +33,7 @@
 
 Name:		gaim-meanwhile
 Version:	2.0.0
-Release:	0.6.%{betaver}%{?dist}
+Release:	0.7.%{betaver}%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://gaim.sourceforge.net/
@@ -61,9 +61,8 @@
 Patch6:   gaim-2.0.0beta5-debian-13_yahoo_webauth_disable.patch
 
 ## Patches 100+: To be Included in Future Upstream
-Patch102: gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch
-Patch103: gaim-2.0.0beta5-debian-03_gconf-gstreamer.patch
 Patch111: gaim-2.0.0beta5-debian-11_reread-resolvconf.patch
+Patch112: gaim-2.0.0beta6-fix-buggy-fetch-url.diff
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Summary:	A Gtk+ based multiprotocol instant messaging client
@@ -165,9 +164,8 @@
 %patch6 -p1
 
 ## Patches 100+: To be Included in Future Upstream
-%patch102 -p0
-%patch103 -p1
 %patch111 -p1
+%patch112 -p0
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}%{betaver}/%{version}-%{release}/g" configure
@@ -302,6 +300,9 @@
 %{_libdir}/gaim/
 
 %changelog
+* Wed Mar 28 2007 Josh Boyer <jwboyer at jdub.homelinux.org> 2.0.0-0.7.beta6
+- Rebuild against most recent core package
+
 * Wed Mar 14 2007 Josh Boyer <jwboyer at jdub.homelinux.org> 2.0.0-0.6.beta6
 - Rebuidl against most recent core package
 


--- gaim-2.0.0beta5-debian-02_gnthistory-in-gtk.patch DELETED ---


--- gaim-2.0.0beta5-debian-03_gconf-gstreamer.patch DELETED ---