rpms/gaim/devel gaim-2.0.0-beta3-config.h.patch, NONE, 1.1 gaim.spec, 1.140, 1.141

[fedora-cvs-commits at redhat.com]

Author: wtogami

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

Modified Files:
	gaim.spec 
Added Files:
	gaim-2.0.0-beta3-config.h.patch 
Log Message:
Fix multilib conflict in -devel (#205206)


gaim-2.0.0-beta3-config.h.patch:
 gtkpluginpref.h |    4 ----
 1 files changed, 4 deletions(-)

--- NEW FILE gaim-2.0.0-beta3-config.h.patch ---
--- gaim-2.0.0beta3/src/gtkpluginpref.h.orig	2006-10-05 09:40:30.000000000 +0900
+++ gaim-2.0.0beta3/src/gtkpluginpref.h	2006-10-05 09:40:47.000000000 +0900
@@ -26,10 +26,6 @@
 #ifndef _GAIM_GTKPLUGINPREF_H_
 #define _GAIM_GTKPLUGINPREF_H_
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include "pluginpref.h"
 
 #include "gtkgaim.h"


Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- gaim.spec	5 Oct 2006 03:25:37 -0000	1.140
+++ gaim.spec	5 Oct 2006 05:10:35 -0000	1.141
@@ -57,6 +57,7 @@
 ## Patches 100+: To be Included in Future Upstream
 Patch181: gaim-2.0.0-beta3-silc-realname.patch
 Patch182: gaim-2.0.0-beta3-utf8-name-crash.patch
+Patch183: gaim-2.0.0-beta3-config.h.patch
 
 Patch200: gaim-2.0.0-beta3-transparent.patch
 
@@ -164,6 +165,7 @@
 ## Patches 100+: To be Included in Future Upstream
 %patch181 -p2
 %patch182 -p0
+%patch183 -p1
 
 %patch200 -p1 -b .transparent
 
@@ -256,6 +258,9 @@
 
 %find_lang gaim
 
+# Bug 205206: this might not be necessary in 2.0.0 beta4+
+rm -f %{_includedir}/gaim/config.h
+
 
 %post 
 /sbin/ldconfig -n %{_libdir}/gaim
@@ -306,6 +311,9 @@
 %{_libdir}/pkgconfig/gaim.pc
 
 %changelog
+* Thu Oct 05 2006 Warren Togami <wtogami at redhat.com> - 2:2.0.0-0.14.beta3
+- Fix multilib conflict in -devel (#205206)
+
 * Sat Sep 30 2006 Matthias Clasen <mclasen at redhat.com> - 2:2.0.0-0.13.beta3
 - Make the tray icon work with transparent panels (#208706)