I kinda like it in %name whichever route we go here. Along the same lines as Ingo's kernel-rt packages, it makes it easier to install them in parallel with normal kernels for testing.
I was just remembering about Ingo's -rt builds. I hadn't looked. What he uses is nearly identical to what I wind up with. It should be easy to use a unified spec file for his -rt patch version too.
I've tweaked my hacks slightly to use name: kernel-vanilla and kernel-branch for the git stuff. For git builds, it now produces e.g. kernel-upstream-2.6.20-2.6.21.rc5.97.1.3025 or kernel-roland-fedora-PAE-2.6.20-2.6.18.rc6.256.1.3025 using the tag and "commit number" from git (1.5) describe, so upgrades for the same branch package should work right without the ginormous date string release numbers I had before. (Those changes are small but I don't have intermediate diffs on hand since I didn't commit the old version. I can send you the new files if you want.)
Thanks, Roland