Created attachment 340259 [details]
Use $RPM_OPT_FLAGS; sources part

Done.  Apologies for not having spotted your original mail.

Not fixed:
http://kojipkgs.fedoraproject.org/packages/gnomint/0.9.1/3.fc11/data/logs/x86_64/

The build log for this build doesn't show any patches tried to be applied, and it is still not using $RPM_OPT_FLAGS.

Also, the devel branch in CVS shows only the change log entry for fix for this bug added, but the actual fix is not there, it's only in the F-11 branch.  There are now two branches with the same NEVR (gnomint-0.9.1-3%{?dist}) but differences in specfiles, please fix this.

Yes, I did it for F-10 but it appears I didn't complete it for F-11, which I will correct.

One question about NEVR - I was a little unsure how to handle the fact that the F-11 branch had already been incremented automatically for the mass rebuild, whereas the others hadn't.

If the same specfile works for all branches, you can just it for all of them, it doesn't matter if it results in going from e.g. -2%{?dist} to -4%{?dist} in let's say F-10.

Okay, thanks for the clarification.

Have tried fixing it in -devel and it builds locally when checked out in a fresh directory, but it fails on koji because it can't find the patch.

I've tried re-adding the patch but it says:

[adam@vaio devel]$ cvs add gnomint-0.9.1-cflags.patch 
cvs add: gnomint-0.9.1-cflags.patch added independently by second party

Apologies for all this extra work - it's my first package and I'm still learning...

No problem.  In case of problems, your sponsor should be able to help, and if not, someone in the Fedora infrastructure team but let's see if I can do it for this case.

I don't know what happened but I *guess* something that could lead to this error is that you 'cvs add'ed the patch to devel/ in some working copy but forgot to commit it and now CVS barfs when you try to add it again in another.  I suppose the patch needs to be 'cvs rm'd in devel/ before it can be added there again.

Thanks for your perseverance.

I have cvs removed the patch from the working copy and re-added it.  However, the devel build fails with the same error, complaining that it can't see the patch.

The patch is listed in CVS in the devel branch, with version 1.3, but it doesn't appear in the checkout.log for the task in koji e.g.

http://koji.fedoraproject.org/koji/getfile?taskID=1324823&name=build.log

That's because koji checks out using the tag gnomint-0_9_1-4_fc12:
http://koji.fedoraproject.org/koji/getfile?taskID=1324823&name=checkout.log

...but no version of the patch has that tag:
http://cvs.fedoraproject.org/viewvc/devel/gnomint/gnomint-0.9.1-cflags.patch?view=log

Something like this in your gnomint/devel/ working tree, then resubmitting the existing failed koji job from the web interface should work (there should be no need to touch any other files, bump revision in the specfile or the like in CVS, just do the tag):

$ cvs tag gnomint-0_9_1-4_fc12 gnomint-0.9.1-cflags.patch

Just tried that and cvs isn't happy:

ERROR: Tag gnomint-0_9_1-4_fc12 has been already created.
The following tags have been created so far
gnomint-0_5_4-2_fc11:devel:verdurin:1223837441
gnomint-0_5_4-2_fc9:F-9:verdurin:1223843324
gnomint-0_5_4-2_fc10:F-10:verdurin:1223843446
gnomint-0_6_0-1_fc9:F-9:verdurin:1228503851
gnomint-0_6_0-1_fc10:F-10:verdurin:1228504458
gnomint-0_9_1-1_fc11:devel:verdurin:1232573270
gnomint-0_9_1-1_fc10:F-10:verdurin:1232574169
gnomint-0_9_1-1_fc9:F-9:verdurin:1232575630
gnomint-0_9_1-2_fc11:devel:jkeating:1235519366
gnomint-0_9_1-2_fc10:F-10:verdurin:1240353500
gnomint-0_9_1-3_fc11:F-11:verdurin:1240354102
gnomint-0_9_1-3_fc12:devel:verdurin:1240355550
gnomint-0_9_1-4_fc11:F-11:verdurin:1240779462
gnomint-0_9_1-4_fc12:devel:verdurin:1240781174
cvs tag: Pre-tag check failed
cvs [tag aborted]: correct the above errors first!

Sought advice on #fedora-devel and dgilmore suggested bumping the release, only in the devel/ branch, so that's what I did.  It builds normally now in devel:

http://koji.fedoraproject.org/koji/taskinfo?taskID=1327158

Yep, build log and debuginfo contents look better now.  Thanks.