Drop patches based on %upstream macro instead of patch number
    
    Let's use the %upstream macro to gate patches which are backports of
    upstream instead of relying on patch numbers. We'll build with %upstream
    defined in packit so that patches which should not be applied on upstream
    builds are skipped.