Drop patch numbers
    
    In the past, we used patch numbers to skip some patches in upstream CI
    builds. The upstream bcond is now used for this instead, so we can
    drop the numbering to make it easier to add an remove patches.
    
    [skip changelog]