This gets most of the Fedora rawhide RPM building again, as long as I
disable CHRP.
Signed-off-by: NPaul Mackerras <paulus@samba.org>