Patches to make RPM build again (Dan Wittenberg)