I used to have some spec file hacks for conditionally building vanilla upstream, or upstream + another git branch, kernels in Fedora rpms. (I made vanilla and vanilla+utrace rpms like this for a while.) davej never wanted the conditional spec bits in cvs, so I let it wither after a while.