I think it would be quite nice if gendiff used zero lines of context for ChangeLog files. That makes it easier for the resulting diff to apply, since the ChangeLog entry just gets put at the top regardless of what's currently at the top.
Created attachment 6472 [details] Here's what I mean.
Fixed in CVS, should be in rpm-4.0.2-0.4 when built.