Give up on trying to modify these patches.
    
    I couldn't get patch to be happy this time.  Dropping those requirements at rpm build time is roughly equivalent.