Description of problem: file /usr/include/gaim/config.h from install of gaim-devel-2.0.0-0.11.beta3.fc6 conflicts with file from package gaim-devel-2.0.0-0.11.beta3.fc6
Uh, aren't those the same package? What are you doing to trigger this problem? "rpm -i"? yum update?
One is x86_64, one is i386. Doing yum install gaim-devel.i386 when only gaim-devel.x86_64 is installed should trigger it.
Ohhhh, I see
Fixed upstream in SVN, will be fixed in 2.0.0 beta4
Stu, Which patch specifically solved this problem? I'd rather include this small patch for FC6 rather than rebase the entire version. We have no time to test the latter.
It was actually a couple of patches separated by other patches. Also it involves patching Makefile.am which would require juggling with autotools to get it patched/built. Fortunately the fix is trivial - simply don't package config.h (eg. rm it in %install) and patch it out of the one Gaim header that was incorrectly #including it: http://svn.sourceforge.net/viewvc/gaim/trunk/gtk/gtkpluginpref.h?r1=16855&r2=17398&view=patch That patch won't apply as-is because the file was src/gtkpluginpref.h in beta3, but it's clear what to do.