Drop all attempts to 'fix' #1490632, revert to same as 6.1-1
    
    Every attempt to 'fix' #1490632 had some kind of problem, and
    Neil eventually left the spec in a broken state (as of 6.1-2).
    Release engineering untagged 6.1-2 to stop it breaking Rawhide
    composes, but then the package got bumped to 6.1-3 and rebuilt
    in the broken state as part of the F28 mass rebuild.
    
    We can't really keep doing this dance, so since Neil hasn't
    indicated a further preference, I'm just reverting the package
    to the state it was in before I filed #1490632 for now. This is
    less of a problem than having it break composes. It's also at
    least a 'clean' state (no patches against upstream).