Note: This is a public test instance of Red Hat Bugzilla. The data contained within is a snapshot of the live data so any changes you make will not be reflected in the production Bugzilla. Email is disabled so feel free to test any aspect of the site that you want. File any problems you find or give feedback at bugzilla.redhat.com.
Bug 205206 - File conflicts in gaim
Summary: File conflicts in gaim
Keywords:
Status: CLOSED RAWHIDE
Alias: None
Product: Fedora
Classification: Fedora
Component: gaim
Version: rawhide
Hardware: All
OS: Linux
medium
medium
Target Milestone: ---
Assignee: Warren Togami
QA Contact:
URL:
Whiteboard:
Depends On:
Blocks: multilibdevel
TreeView+ depends on / blocked
 
Reported: 2006-09-05 14:14 UTC by Bill Nottingham
Modified: 2014-03-17 03:02 UTC (History)
7 users (show)

Fixed In Version:
Doc Type: Bug Fix
Doc Text:
Clone Of:
Environment:
Last Closed: 2006-11-27 18:17:09 UTC
Type: ---
Embargoed:

Attachments (Terms of Use)

Description Bill Nottingham 2006-09-05 14:14:33 UTC 
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
Comment 1 Mark Doliner 2006-09-05 16:29:49 UTC 
Uh, aren't those the same package?  What are you doing to trigger this problem?
 "rpm -i"?  yum update?
Comment 2 Bill Nottingham 2006-09-05 17:36:33 UTC 
One is x86_64, one is i386. Doing yum install gaim-devel.i386 when only
gaim-devel.x86_64 is installed should trigger it.
Comment 3 Mark Doliner 2006-09-05 18:13:47 UTC 
Ohhhh, I see
Comment 4 Stu Tomlinson 2006-09-29 20:24:10 UTC 
Fixed upstream in SVN, will be fixed in 2.0.0 beta4
Comment 5 Warren Togami 2006-10-04 08:28:55 UTC 
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.
Comment 6 Stu Tomlinson 2006-10-04 14:45:40 UTC 
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.
Note You need to log in before you can comment on or make changes to this bug.